Skip to content
Permalink
Browse files
Merge branch 'ibm-trunk' into TypeRepo-with-ClassValue
  • Loading branch information
ngmr committed Mar 11, 2015
2 parents 7664924 + 776af64 commit e14980140a436b819d99b2351b96d9f1bfb44fa9
Show file tree
Hide file tree
Showing 29 changed files with 994 additions and 915 deletions.
@@ -6,6 +6,7 @@
import java.util.List;

import org.apache.yoko.orb.CosNaming.tnaming2.NamingContextImpl.BoundObject;
import org.apache.yoko.orb.spi.naming.RemoteAccess;
import org.omg.CORBA.LocalObject;
import org.omg.CosNaming.Binding;
import org.omg.CosNaming.BindingHolder;
@@ -160,7 +161,7 @@ public void destroy() {
}

@Override
public Servant getServant(POA poa, boolean readOnly) throws Exception {
public Servant getServant(POA poa, RemoteAccess ignored) throws Exception {
return new POAServant(poa, core);
}
}

This file was deleted.

This file was deleted.

@@ -672,8 +672,8 @@ protected void escapeName(String name, StringBuffer out) {
// scan the string adding the escapes
for (int i = 0; i < name.length(); i++) {
char ch = name.charAt(i);
if (ch == '.' || ch == '/') {
out.append('/');
if (ch == '.' || ch == '/' || ch == '\\') {
out.append('\\');
}
out.append(ch);
}

0 comments on commit e149801

Please sign in to comment.