You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2007/03/30 17:46:38 UTC

svn commit: r524138 - /incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java

Author: rfeng
Date: Fri Mar 30 08:46:37 2007
New Revision: 524138

URL: http://svn.apache.org/viewvc?view=rev&rev=524138
Log:
Check for NPE

Modified:
    incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java

Modified: incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java?view=diff&rev=524138&r1=524137&r2=524138
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java (original)
+++ incubator/tuscany/branches/sca-java-integration/sca/services/databinding/databinding-sdo/src/main/java/org/apache/tuscany/databinding/sdo/SDOContextHelper.java Fri Mar 30 08:46:37 2007
@@ -55,7 +55,10 @@
 //            }
             AtomicComponent child = (AtomicComponent)composite.getSystemChild(HelperContext.class.getName());
             try {
-                helperContext = (HelperContext)child.getTargetInstance();
+                // The child can be null if no import.sdo is declared
+                if (child != null) {
+                    helperContext = (HelperContext)child.getTargetInstance();
+                }
             } catch (TargetResolutionException e) {
                 helperContext = null;
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org