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 dm...@apache.org on 2007/05/25 15:04:06 UTC
svn commit: r541678 -
/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java
Author: dmiddlem
Date: Fri May 25 08:04:05 2007
New Revision: 541678
URL: http://svn.apache.org/viewvc?view=rev&rev=541678
Log:
Commit for YOKO-366:
* Carry over changes made to the binding after this branch was created.
Modified:
incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java
Modified: incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java
URL: http://svn.apache.org/viewvc/incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java?view=diff&rev=541678&r1=541677&r2=541678
==============================================================================
--- incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java (original)
+++ incubator/yoko/branches/perf/src/main/java/org/apache/yoko/bindings/corba/utils/CorbaBindingHelper.java Fri May 25 08:04:05 2007
@@ -94,7 +94,8 @@
orb = ORB.init(orbArgs.toArray(new String[orbArgs.size()]), props);
orbList.put(getORBNameFromAddress(address), orb);
- } else if (scheme.equals("file") || scheme.equals("relfile") || scheme.equals("IOR")) {
+ } else if (scheme.equals("file") || scheme.equals("relfile")
+ || scheme.equals("IOR") || scheme.equals("ior")) {
orb = ORB.init(orbArgs.toArray(new String[orbArgs.size()]), props);
orbList.put(getORBNameFromAddress(address), orb);
@@ -108,6 +109,10 @@
public static ORB getAddressSpecificORB(String address) {
return orbList.get(getORBNameFromAddress(address));
}
+
+ public static void addAddressSpecificORB(String address, ORB orb) {
+ orbList.put(getORBNameFromAddress(address), orb);
+ }
public static String getORBNameFromAddress(String address) {
String name = null;
@@ -124,7 +129,7 @@
String schemeSpecificPart = addressURI.getSchemeSpecificPart();
int keyIndex = schemeSpecificPart.indexOf('/');
name = schemeSpecificPart.substring(0, keyIndex);
- } else if (scheme.equals("IOR")) {
+ } else if (scheme.equals("IOR") || scheme.equals("ior")) {
name = addressURI.toString();
} else if (scheme.equals("file") || scheme.equals("relfile")) {
name = addressURI.getPath();