|
From: Michael R. <mr...@us...> - 2002-01-10 08:56:58
|
Update of /cvsroot/openorb/RMIoverIIOP/src/main/org/openorb/rmi/system
In directory usw-pr-cvs1:/tmp/cvs-serv28145/RMIoverIIOP/src/main/org/openorb/rmi/system
Modified Files:
NameMangling.java
Log Message:
Committed the patch for bug SF#501292/Exolab#850
Index: NameMangling.java
===================================================================
RCS file: /cvsroot/openorb/RMIoverIIOP/src/main/org/openorb/rmi/system/NameMangling.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** NameMangling.java 2002/01/09 12:45:38 1.1.1.1
--- NameMangling.java 2002/01/10 08:56:55 1.2
***************
*** 126,130 ****
ret[1] = clz.getName().substring(ret[0].length()+1);
} else {
! ret = new String [] { "", clz.getName() };
}
--- 126,143 ----
ret[1] = clz.getName().substring(ret[0].length()+1);
} else {
! String clzName = clz.getName();
! // WORKAROUND: BUG #501292
! // The ClassLoader sometimes does not load the package information
! // of a new class correctly so that the getPackage() call returned
! // null. This has been observed when a custom ClassLoader has not
! // been derived from URLClassLoader and thus dows not load the
! // internal package map correctly.
! if (clzName != null && clzName.lastIndexOf('.') != -1) {
! ret = new String [] { null, null };
! ret[0] = clzName.substring(0, clzName.lastIndexOf('.'));
! ret[1] = clzName.substring(ret[0].length()+1);
! } else {
! ret = new String [] { "", clzName };
! }
}
|