[hydra-commits] beagles: branch ice/preserve-graphs r642 - in /ice/branches/preserve-graphs: ...
SVN commits to the Hydra project
hydra-commits at lists.digium.com
Tue May 25 11:04:24 CDT 2010
Author: beagles
Date: Tue May 25 11:04:23 2010
New Revision: 642
URL: https://origsvn.digium.com/svn-view/hydra?view=rev&rev=642
Log:
fix exception slicing test project structure so it would not go around the slice preserving code
Removed:
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/Test.ice
Modified:
ice/branches/preserve-graphs/cpp/src/slice2cs/Gen.cpp
ice/branches/preserve-graphs/cpp/src/slice2java/Gen.cpp
ice/branches/preserve-graphs/cs/src/Ice/BasicStream.cs
ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs
ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/ClientPrivate.ice
ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/Makefile
ice/branches/preserve-graphs/java/build.xml
ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AllTests.java
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/Client.java
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivate.ice
ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/TestI.java
Modified: ice/branches/preserve-graphs/cpp/src/slice2cs/Gen.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/slice2cs/Gen.cpp?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/slice2cs/Gen.cpp (original)
+++ ice/branches/preserve-graphs/cpp/src/slice2cs/Gen.cpp Tue May 25 11:04:23 2010
@@ -2856,7 +2856,7 @@
_out << sb;
_out << nl << "foreach(Ice.SkippedSlice i in preserved__)";
_out << sb;
- _out << nl << "os__.writeTypeId(i.typeId);";
+ _out << nl << "os__.writeString(i.typeId);";
_out << nl << "_System.Collections.Generic.List<Ice.ObjectIdOffset> offsets;";
_out << nl << "if(objectIdMap__.TryGetValue(i.typeId, out offsets))";
_out << sb;
@@ -3149,6 +3149,13 @@
_out << sp << nl << "public override bool usesClasses__()";
_out << sb;
_out << nl << "return true;";
+ _out << eb;
+ }
+ else if(switchWrites)
+ {
+ _out << sp << nl << "public override bool usesClasses__()";
+ _out << sb;
+ _out << nl << "return objectIdMap__.Count > 0;";
_out << eb;
}
Modified: ice/branches/preserve-graphs/cpp/src/slice2java/Gen.cpp
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cpp/src/slice2java/Gen.cpp?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/cpp/src/slice2java/Gen.cpp (original)
+++ ice/branches/preserve-graphs/cpp/src/slice2java/Gen.cpp Tue May 25 11:04:23 2010
@@ -2802,7 +2802,7 @@
out << sb;
out << nl << "for(Ice.SkippedSlice i : __preserved)";
out << sb;
- out << nl << "__os.writeTypeId(i.typeId);";
+ out << nl << "__os.writeString(i.typeId);";
out << nl << "java.util.List<Ice.ObjectIdOffset> offsets = __objectIdMap.get(i.typeId);";
out << nl << "if(offsets != null)";
out << sb;
@@ -3107,6 +3107,13 @@
out << eb;
}
}
+ else if(switchWrites)
+ {
+ out << sp << nl << "public boolean" << nl << "__usesClasses()";
+ out << sb;
+ out << nl << "return __objectIdMap.size() > 0;";
+ out << eb;
+ }
}
out << eb;
Modified: ice/branches/preserve-graphs/cs/src/Ice/BasicStream.cs
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/src/Ice/BasicStream.cs?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/cs/src/Ice/BasicStream.cs (original)
+++ ice/branches/preserve-graphs/cs/src/Ice/BasicStream.cs Tue May 25 11:04:23 2010
@@ -2315,7 +2315,7 @@
catch(Ice.UserException ex)
{
ex.read__(this, false);
- if(usesClasses)
+ if(usesClasses || ex.usesClasses__())
{
readPendingObjects();
}
Modified: ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs (original)
+++ ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/AllTests.cs Tue May 25 11:04:23 2010
@@ -331,7 +331,7 @@
public override void unknownDerivedAsBase(Ice.Current current)
{
- ClientUnknownDerived ex = new ClientUnknownDerived();
+ TestClient.ClientUnknownDerived ex = new TestClient.ClientUnknownDerived();
ex.ud = "UnknownDerived";
ex.b = "Base";
throw ex;
@@ -339,7 +339,7 @@
public override void unsliceableDerivedAsBase(Ice.Current current)
{
- ClientUnsliceableDerived ex = new ClientUnsliceableDerived();
+ TestClient.ClientUnsliceableDerived ex = new TestClient.ClientUnsliceableDerived();
ex.ud = "UnsliceableDerived";
ex.b = "Base";
throw ex;
@@ -347,9 +347,9 @@
public override void unsliceableWithInnerClass(Ice.Current current)
{
- ClientUnsliceableWithClass ex = new ClientUnsliceableWithClass();
+ TestClient.ClientUnsliceableWithClass ex = new TestClient.ClientUnsliceableWithClass();
ex.b = "WithInnerClass";
- ex.myObj = new InnerClassDerived();
+ ex.myObj = new TestClient.InnerClassDerived();
ex.myObj.ic = "InnerClass";
ex.myObj.id = "InnerClassDerived";
throw ex;
@@ -828,7 +828,7 @@
catch(Base b)
{
test(b.b.Equals("Base"));
- test(b.ice_name().Equals("Test::ClientUnknownDerived"));
+ test(b.ice_name().Equals("Test::Base"));
}
catch(Exception)
{
@@ -848,7 +848,7 @@
catch(Base b)
{
test(b.b.Equals("Base"));
- test(b.ice_name().Equals("Test::ClientUnknownDerived"));
+ test(b.ice_name().Equals("Test::Base"));
}
catch(Exception)
{
@@ -868,10 +868,11 @@
catch(Base b)
{
test(b.b.Equals("Base"));
- test(b.ice_name().Equals("Test::ClientUnsliceableDerived"));
- }
- catch(Exception)
- {
+ test(b.ice_name().Equals("TestClient::ClientUnsliceableDerived"));
+ }
+ catch(Exception ex)
+ {
+ Console.Out.WriteLine(ex);
test(false);
}
}
@@ -888,7 +889,7 @@
catch(Base b)
{
test(b.b.Equals("Base"));
- test(b.ice_name().Equals("Test::ClientUnsliceableDerived"));
+ test(b.ice_name().Equals("TestClient::ClientUnsliceableDerived"));
}
catch(Exception)
{
@@ -907,12 +908,12 @@
}
catch(Base b)
{
- test(b.ice_name().Equals("Test::ClientUnsliceableWithClass"));
+ test(b.ice_name().Equals("TestClient::ClientUnsliceableWithClass"));
try
{
- ClientUnsliceableWithClass ex = (ClientUnsliceableWithClass)b;
+ TestClient.ClientUnsliceableWithClass ex = (TestClient.ClientUnsliceableWithClass)b;
test(ex.myObj != null);
- test(ex.myObj.ice_id().Equals("::Test::InnerClassDerived"));
+ test(ex.myObj.ice_id().Equals("::TestClient::InnerClassDerived"));
test(ex.myObj.ic.Equals("InnerClass"));
test(ex.myObj.id.Equals("InnerClassDerived"));
}
Modified: ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/ClientPrivate.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/ClientPrivate.ice?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/ClientPrivate.ice (original)
+++ ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/ClientPrivate.ice Tue May 25 11:04:23 2010
@@ -12,25 +12,25 @@
#include <Test.ice>
-module Test
+module TestClient
{
-class InnerClassDerived extends InnerClass
+class InnerClassDerived extends Test::InnerClass
{
string id;
};
-exception ClientUnknownDerived extends Base
+exception ClientUnknownDerived extends Test::Base
{
string ud;
};
-exception ClientUnsliceableDerived extends BaseUnsliceable
+exception ClientUnsliceableDerived extends Test::BaseUnsliceable
{
string ud;
};
-exception ClientUnsliceableWithClass extends BaseUnsliceable
+exception ClientUnsliceableWithClass extends Test::BaseUnsliceable
{
InnerClassDerived myObj;
};
Modified: ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/Makefile
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/Makefile?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/Makefile (original)
+++ ice/branches/preserve-graphs/cs/test/Ice/slicing/exceptions/Makefile Tue May 25 11:04:23 2010
@@ -15,12 +15,13 @@
S_SRCS = Server.cs TestI.cs
SAMD_SRCS = Server.cs TestAMDI.cs
-SLICE_SRCS = $(SDIR)/Test.ice \
- $(SDIR)/ClientPrivate.ice
+SLICE_SRCS = $(SDIR)/Test.ice
SLICE_S_SRCS = $(SDIR)/ServerPrivate.ice
SLICE_AMD_SRCS = $(SDIR)/TestAMD.ice
SLICE_SAMD_SRCS = $(SDIR)/ServerPrivateAMD.ice
+
+SLICE_C_SRCS = $(SDIR)/ClientPrivate.ice
SDIR = .
@@ -32,7 +33,7 @@
SLICE2CSFLAGS := $(SLICE2CSFLAGS) -I.
-client.exe: $(C_SRCS) $(GEN_SRCS)
+client.exe: $(C_SRCS) $(GEN_SRCS) $(CGEN_SRCS)
$(MCS) $(MCSFLAGS) -out:$@ $(call ref,Ice) $(subst /,$(DSEP),$^)
server.exe: $(S_SRCS) $(GEN_SRCS) $(SGEN_SRCS)
Modified: ice/branches/preserve-graphs/java/build.xml
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/build.xml?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/java/build.xml (original)
+++ ice/branches/preserve-graphs/java/build.xml Tue May 25 11:04:23 2010
@@ -327,7 +327,6 @@
<include name="Test.ice" />
</fileset>
<fileset dir="test/Ice/slicing/exceptions">
- <include name="Test.ice" />
<include name="ServerPrivate.ice" />
<include name="ServerPrivateAMD.ice" />
<include name="ClientPrivate.ice" />
Modified: ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java (original)
+++ ice/branches/preserve-graphs/java/src/IceInternal/BasicStream.java Tue May 25 11:04:23 2010
@@ -1622,7 +1622,7 @@
catch(Ice.UserException ex)
{
ex.__read(this, false);
- if(usesClasses)
+ if(usesClasses || ex.__usesClasses())
{
readPendingObjects();
}
Modified: ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AllTests.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AllTests.java?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AllTests.java (original)
+++ ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/AllTests.java Tue May 25 11:04:23 2010
@@ -9,33 +9,33 @@
package test.Ice.slicing.exceptions;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_baseAsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownDerivedAsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownDerivedAsKnownDerived;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownIntermediateAsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownIntermediateAsKnownIntermediate;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownMostDerivedAsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownMostDerivedAsKnownIntermediate;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_knownMostDerivedAsKnownMostDerived;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_unknownDerivedAsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_unknownIntermediateAsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_unknownMostDerived1AsBase;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_unknownMostDerived1AsKnownIntermediate;
-import test.Ice.slicing.exceptions.Test.Callback_TestIntf_unknownMostDerived2AsBase;
-import test.Ice.slicing.exceptions.Test.Base;
-import test.Ice.slicing.exceptions.Test.KnownDerived;
-import test.Ice.slicing.exceptions.Test.KnownIntermediate;
-import test.Ice.slicing.exceptions.Test.KnownMostDerived;
-import test.Ice.slicing.exceptions.Test.TestIntfPrx;
-import test.Ice.slicing.exceptions.Test.TestIntfPrxHelper;
-import test.Ice.slicing.exceptions.Test._ClientIntfDisp;
-import test.Ice.slicing.exceptions.Test.ClientIntfPrx;
-import test.Ice.slicing.exceptions.Test.ClientIntfPrxHelper;
-import test.Ice.slicing.exceptions.Test.ClientUnknownDerived;
-import test.Ice.slicing.exceptions.Test.ClientUnsliceableDerived;
-import test.Ice.slicing.exceptions.Test.ClientUnsliceableWithClass;
-import test.Ice.slicing.exceptions.Test.InnerClass;
-import test.Ice.slicing.exceptions.Test.InnerClassDerived;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_baseAsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownDerivedAsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownDerivedAsKnownDerived;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownIntermediateAsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownIntermediateAsKnownIntermediate;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownMostDerivedAsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownMostDerivedAsKnownIntermediate;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_knownMostDerivedAsKnownMostDerived;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_unknownDerivedAsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_unknownIntermediateAsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_unknownMostDerived1AsBase;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_unknownMostDerived1AsKnownIntermediate;
+import test.Ice.slicing.exceptions.client.Test.Callback_TestIntf_unknownMostDerived2AsBase;
+import test.Ice.slicing.exceptions.client.Test.Base;
+import test.Ice.slicing.exceptions.client.Test.KnownDerived;
+import test.Ice.slicing.exceptions.client.Test.KnownIntermediate;
+import test.Ice.slicing.exceptions.client.Test.KnownMostDerived;
+import test.Ice.slicing.exceptions.client.Test.TestIntfPrx;
+import test.Ice.slicing.exceptions.client.Test.TestIntfPrxHelper;
+import test.Ice.slicing.exceptions.client.Test._ClientIntfDisp;
+import test.Ice.slicing.exceptions.client.Test.ClientIntfPrx;
+import test.Ice.slicing.exceptions.client.Test.ClientIntfPrxHelper;
+import test.Ice.slicing.exceptions.client.Test.ClientUnknownDerived;
+import test.Ice.slicing.exceptions.client.Test.ClientUnsliceableDerived;
+import test.Ice.slicing.exceptions.client.Test.ClientUnsliceableWithClass;
+import test.Ice.slicing.exceptions.client.Test.InnerClass;
+import test.Ice.slicing.exceptions.client.Test.InnerClassDerived;
public class AllTests
{
@@ -1128,6 +1128,7 @@
}
catch(Exception ex)
{
+ System.err.println(ex);
test(false);
}
}
@@ -1164,7 +1165,7 @@
catch(Base b)
{
test(b.b.equals("Base"));
- test(b.ice_name().equals("Test::ClientUnknownDerived"));
+ test(b.ice_name().equals("Test::Base"));
}
catch(Exception ex)
{
@@ -1184,7 +1185,7 @@
catch(Base b)
{
test(b.b.equals("Base"));
- test(b.ice_name().equals("Test::ClientUnknownDerived"));
+ test(b.ice_name().equals("Test::Base"));
}
catch(Exception ex)
{
Modified: ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/Client.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/Client.java?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/Client.java (original)
+++ ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/Client.java Tue May 25 11:04:23 2010
@@ -9,7 +9,7 @@
package test.Ice.slicing.exceptions;
-import test.Ice.slicing.exceptions.Test.TestIntfPrx;
+import test.Ice.slicing.exceptions.client.Test.TestIntfPrx;
public class Client extends test.Util.Application
{
@@ -17,7 +17,7 @@
{
Ice.InitializationData initData = new Ice.InitializationData();
initData.properties = Ice.Util.createProperties(argsH);
- initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions");
+ initData.properties.setProperty("Ice.Package.Test", "test.Ice.slicing.exceptions.client");
return initData;
}
Modified: ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivate.ice
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivate.ice?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivate.ice (original)
+++ ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/ServerPrivate.ice Tue May 25 11:04:23 2010
@@ -36,6 +36,25 @@
string kmd;
};
+["preserve"]
+exception BaseUnsliceable extends Base
+{
+};
+
+["preserve"]
+class InnerClass
+{
+ string ic;
+};
+
+interface ClientIntf
+{
+ void baseAsBase() throws Base;
+ void unknownDerivedAsBase() throws Base;
+ void unsliceableDerivedAsBase() throws Base;
+ void unsliceableWithInnerClass() throws Base;
+};
+
interface TestIntf
{
void baseAsBase() throws Base;
@@ -53,6 +72,14 @@
void unknownMostDerived1AsBase() throws Base;
void unknownMostDerived1AsKnownIntermediate() throws KnownIntermediate;
void unknownMostDerived2AsBase() throws Base;
+
+ void clientBaseAsBasePass(ClientIntf* client) throws Base;
+ void clientUnknownDerivedAsBasePass(ClientIntf* client) throws Base;
+ void clientUnsliceableDerivedAsBasePass(ClientIntf* client) throws Base;
+ void clientBaseAsBaseRethrow(ClientIntf* client) throws Base;
+ void clientUnknownDerivedAsBaseRethrow(ClientIntf* client) throws Base;
+ void clientUnsliceableDerivedAsBaseRethrow(ClientIntf* client) throws Base;
+ void clientUnsliceableInnerClassRethrow(ClientIntf* client) throws Base;
void shutdown();
};
Modified: ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/TestI.java
URL: https://origsvn.digium.com/svn-view/hydra/ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/TestI.java?view=diff&rev=642&r1=641&r2=642
==============================================================================
--- ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/TestI.java (original)
+++ ice/branches/preserve-graphs/java/test/Ice/slicing/exceptions/TestI.java Tue May 25 11:04:23 2010
@@ -18,8 +18,8 @@
import test.Ice.slicing.exceptions.server.Test.UnknownMostDerived1;
import test.Ice.slicing.exceptions.server.Test.UnknownMostDerived2;
import test.Ice.slicing.exceptions.server.Test._TestIntfDisp;
-import test.Ice.slicing.exceptions.Test.ClientIntfPrx;
-import test.Ice.slicing.exceptions.Test.ClientIntfPrxHelper;
+import test.Ice.slicing.exceptions.server.Test.ClientIntfPrx;
+import test.Ice.slicing.exceptions.server.Test.ClientIntfPrxHelper;
public final class TestI extends _TestIntfDisp
{
@@ -171,34 +171,34 @@
public void
clientBaseAsBasePass(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
client.baseAsBase();
}
public void
clientUnknownDerivedAsBasePass(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
client.unknownDerivedAsBase();
}
public void
clientUnsliceableDerivedAsBasePass(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
client.unsliceableDerivedAsBase();
}
public void
clientBaseAsBaseRethrow(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
try
{
client.baseAsBase();
}
- catch(test.Ice.slicing.exceptions.Test.Base ex)
+ catch(Base ex)
{
throw ex;
}
@@ -206,13 +206,13 @@
public void
clientUnknownDerivedAsBaseRethrow(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
try
{
client.unknownDerivedAsBase();
}
- catch(test.Ice.slicing.exceptions.Test.Base ex)
+ catch(Base ex)
{
throw ex;
}
@@ -220,13 +220,13 @@
public void
clientUnsliceableDerivedAsBaseRethrow(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
try
{
client.unsliceableDerivedAsBase();
}
- catch(test.Ice.slicing.exceptions.Test.Base ex)
+ catch(Base ex)
{
throw ex;
}
@@ -234,13 +234,13 @@
public void
clientUnsliceableInnerClassRethrow(ClientIntfPrx client, Ice.Current current)
- throws test.Ice.slicing.exceptions.Test.Base
+ throws Base
{
try
{
client.unsliceableWithInnerClass();
}
- catch(test.Ice.slicing.exceptions.Test.Base ex)
+ catch(Base ex)
{
throw ex;
}
More information about the asterisk-scf-commits
mailing list