Author: cschneider
Date: Mon Feb 23 15:46:21 2015
New Revision: 1661703
URL: http://svn.apache.org/r1661703
Log:
Added some check to avoid NullPointerException during startup
Partly applied
Signed-off-by: Christian Schneider <[email protected]>
Modified:
aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
Modified:
aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java?rev=1661703&r1=1661702&r2=1661703&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
(original)
+++
aries/trunk/jpa/jpa-container-eclipselink-adapter/src/main/java/org/apache/aries/jpa/eclipselink/adapter/Activator.java
Mon Feb 23 15:46:21 2015
@@ -141,22 +141,24 @@ public class Activator implements Bundle
for (Bundle b : context.getBundles()) {
BundleWiring bw = b.adapt(BundleWiring.class);
- List<BundleWire> wires =
bw.getProvidedWires(BundleRevision.PACKAGE_NAMESPACE);
-
- for (BundleWire w : wires) {
- String pkgName = (String)
w.getCapability().getAttributes().get(BundleRevision.PACKAGE_NAMESPACE);
-
- boolean add = false;
- if (b.equals(jpaBundle)) {
- add = true;
- } else if (pkgName.startsWith("org.eclipse.persistence")) {
- add = true;
- }
-
- if (add) {
- String suffix = ";" +
Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE + "=" + b.getSymbolicName() + ";" +
Constants.BUNDLE_VERSION_ATTRIBUTE + "=" + b.getVersion();
- result.add(pkgName + suffix);
- }
+ if(bw != null) {
+ List<BundleWire> wires =
bw.getProvidedWires(BundleRevision.PACKAGE_NAMESPACE);
+
+ for (BundleWire w : wires) {
+ String pkgName = (String)
w.getCapability().getAttributes().get(BundleRevision.PACKAGE_NAMESPACE);
+
+ boolean add = false;
+ if (b.equals(jpaBundle)) {
+ add = true;
+ } else if
(pkgName.startsWith("org.eclipse.persistence")) {
+ add = true;
+ }
+
+ if (add) {
+ String suffix = ";" +
Constants.BUNDLE_SYMBOLICNAME_ATTRIBUTE + "=" + b.getSymbolicName() + ";" +
Constants.BUNDLE_VERSION_ATTRIBUTE + "=" + b.getVersion();
+ result.add(pkgName + suffix);
+ }
+ }
}
}
Modified:
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
URL:
http://svn.apache.org/viewvc/aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java?rev=1661703&r1=1661702&r2=1661703&view=diff
==============================================================================
---
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
(original)
+++
aries/trunk/jpa/jpa-container-itest/src/test/java/org/apache/aries/jpa/itest/AbstractJPAItest.java
Mon Feb 23 15:46:21 2015
@@ -80,7 +80,9 @@ public abstract class AbstractJPAItest e
// this is how you set the default log level when using pax
// logging (logProfile)
systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
- when(localRepo !=
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo)));
+ when(localRepo !=
null).useOptions(vmOption("-Dorg.ops4j.pax.url.mvn.localRepository=" +
localRepo))
+// ,
vmOption("-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005")
+ );
}
private Option ariesJpaInternal() {
