You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/09/30 20:26:10 UTC

svn commit: r292833 - /geronimo/branches/1.0-M5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java

Author: djencks
Date: Fri Sep 30 11:26:08 2005
New Revision: 292833

URL: http://svn.apache.org/viewcvs?rev=292833&view=rev
Log:
GERONIMO-1034 avoid NPE

Modified:
    geronimo/branches/1.0-M5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java

Modified: geronimo/branches/1.0-M5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java?rev=292833&r1=292832&r2=292833&view=diff
==============================================================================
--- geronimo/branches/1.0-M5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java (original)
+++ geronimo/branches/1.0-M5/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Fri Sep 30 11:26:08 2005
@@ -398,7 +398,7 @@
 
                 String ejbLink = null;
                 GerEjbRefType remoteRef = (GerEjbRefType) ejbRefMap.get(ejbRefName);
-                if (remoteRef.isSetNsCorbaloc()) {
+                if (remoteRef != null && remoteRef.isSetNsCorbaloc()) {
                     try {
                         ObjectName cssBean;
                         if (remoteRef.isSetCssName()) {