Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 57256 invoked from network); 16 Mar 2007 17:03:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 16 Mar 2007 17:03:40 -0000 Received: (qmail 21976 invoked by uid 500); 16 Mar 2007 17:03:48 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 21932 invoked by uid 500); 16 Mar 2007 17:03:48 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 21917 invoked by uid 99); 16 Mar 2007 17:03:48 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2007 10:03:48 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 16 Mar 2007 10:03:39 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 46B241A983A; Fri, 16 Mar 2007 10:03:19 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r519061 - /geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Date: Fri, 16 Mar 2007 17:03:19 -0000 To: scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070316170319.46B241A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dain Date: Fri Mar 16 10:03:18 2007 New Revision: 519061 URL: http://svn.apache.org/viewvc?view=rev&rev=519061 Log: Fixed null pointer exception Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Modified: geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?view=diff&rev=519061&r1=519060&r2=519061 ============================================================================== --- geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original) +++ geronimo/server/trunk/modules/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Fri Mar 16 10:03:18 2007 @@ -506,9 +506,12 @@ // todo Persistence Unit Data Sources need to be global JNDI names Object altDD = ejbModule.getEjbModule().getAltDDs().get("openejb-jar.xml"); if (altDD instanceof OpenejbJarType) { - String datasourceName = ((OpenejbJarType) altDD).getCmpConnectionFactory().getResourceLink(); - if (datasourceName != null) { - jtaDataSource = "?name=" + datasourceName; + ResourceLocatorType cmpConnectionFactory = ((OpenejbJarType) altDD).getCmpConnectionFactory(); + if (cmpConnectionFactory != null) { + String datasourceName = cmpConnectionFactory.getResourceLink(); + if (datasourceName != null) { + jtaDataSource = "?name=" + datasourceName; + } } }