You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2008/12/04 13:06:46 UTC
svn commit: r723299 -
/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java
Author: rickmcguire
Date: Thu Dec 4 04:06:45 2008
New Revision: 723299
URL: http://svn.apache.org/viewvc?rev=723299&view=rev
Log:
GERONIMO-4447 Nullpointer exception reading RMI data that resolves to a null.
Modified:
geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java
Modified: geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java
URL: http://svn.apache.org/viewvc/geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java?rev=723299&r1=723298&r2=723299&view=diff
==============================================================================
--- geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java (original)
+++ geronimo/yoko/trunk/core/src/main/java/org/apache/yoko/orb/OB/ValueReader.java Thu Dec 4 04:06:45 2008
@@ -354,7 +354,10 @@
// Java only
private void addInstance(int pos, java.io.Serializable instance) {
- instanceTable_.put(new Integer(pos), instance);
+ // only add this if we have a real value
+ if (instance != null) {
+ instanceTable_.put(new Integer(pos), instance);
+ }
}
// Java only