You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by ri...@apache.org on 2006/11/07 13:01:57 UTC
svn commit: r472095 [4/4] - in /incubator/yoko/trunk:
bindings/src/main/java/org/apache/yoko/bindings/corba/
bindings/src/test/java/org/apache/yoko/bindings/corba/
bindings/src/test/java/org/apache/yoko/bindings/corba/types/
core/src/main/java/org/apac...
Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/client/Client.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/client/Client.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/client/Client.java (original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/client/Client.java Tue Nov 7 05:01:55 2006
@@ -27,7 +27,7 @@
public class Client {
static int run(ORB orb, String[] args) throws UserException {
-
+
// Get "hello" object
Object obj = orb.string_to_object("corbaloc::localhost:40000/hw");
if(obj == null) {
@@ -55,7 +55,8 @@
int status = 0;
ORB orb = null;
- Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass",
"org.apache.yoko.orb.CORBA.ORBSingleton");
Modified: incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/server/Server.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/server/Server.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/server/Server.java (original)
+++ incubator/yoko/trunk/distribution/src/main/samples/ws/hello_world/src/corba/server/Server.java Tue Nov 7 05:01:55 2006
@@ -65,7 +65,8 @@
}
public static void main(String args[]) {
- Properties props = System.getProperties();
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
props.put("org.omg.CORBA.ORBClass", "org.apache.yoko.orb.CORBA.ORB");
props.put("org.omg.CORBA.ORBSingletonClass",
"org.apache.yoko.orb.CORBA.ORBSingleton");
Modified: incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/impl/PortableRemoteObjectExtImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/impl/PortableRemoteObjectExtImpl.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/impl/PortableRemoteObjectExtImpl.java (original)
+++ incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/impl/PortableRemoteObjectExtImpl.java Tue Nov 7 05:01:55 2006
@@ -13,10 +13,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-*/
+*/
package org.apache.yoko.rmi.impl;
+import java.util.Properties;
+
import org.apache.yoko.rmi.api.PortableRemoteObjectExtDelegate;
import org.apache.yoko.rmi.api.PortableRemoteObjectState;
import org.apache.yoko.rmi.util.ClassLoaderLocal;
@@ -26,18 +28,20 @@
PortableRemoteObjectExtDelegate {
private static ClassLoaderLocal rmiState = new ClassLoaderLocal(RMIState.class.getName());
-
+
private static org.omg.CORBA.ORB defaultOrb;
-
+
private static org.omg.CORBA.ORB getDefaultOrb() {
if(defaultOrb == null) {
- defaultOrb = org.omg.CORBA.ORB.init(new String[0], System.getProperties());
+ java.util.Properties props = new Properties();
+ props.putAll(System.getProperties());
+ defaultOrb = org.omg.CORBA.ORB.init(new String[0], props);
}
return defaultOrb;
}
-
+
private static int nextRMIStateId = 0;
-
+
public PortableRemoteObjectState getCurrentState() {
RMIState state = (RMIState) rmiState.get();
if(state == null) {
Modified: incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/util/stub/BCELClassBuilder.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/util/stub/BCELClassBuilder.java?view=diff&rev=472095&r1=472094&r2=472095
==============================================================================
--- incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/util/stub/BCELClassBuilder.java (original)
+++ incubator/yoko/trunk/rmi/src/main/java/org/apache/yoko/rmi/util/stub/BCELClassBuilder.java Tue Nov 7 05:01:55 2006
@@ -13,7 +13,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-*/
+*/
package org.apache.yoko.rmi.util.stub;
@@ -707,7 +707,7 @@
index += methodArgTypes[i].getSize();
}
- //
+ //
// invoke handler's method
//
InstructionHandle tryStart = emitInvoke(il, fac, handlerMethodRef);
@@ -719,7 +719,7 @@
InstructionHandle tryEnd = emitReturn(il, methodReturnType);
- //
+ //
// catch...
//
InstructionHandle rethrowLocation = il.append(new ATHROW());