Author: gnodet
Date: Tue Feb 26 14:49:00 2008
New Revision: 631412
URL: http://svn.apache.org/viewvc?rev=631412&view=rev
Log:
Fix possible NPE and fix classloader problems (default to self-first instead of
parent-first)
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/ComponentDesc.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/ComponentDesc.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/ComponentDesc.java?rev=631412&r1=631411&r2=631412&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/ComponentDesc.java
(original)
+++
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/ComponentDesc.java
Tue Feb 26 14:49:00 2008
@@ -152,7 +152,7 @@
// Implementation methods
//-------------------------------------------------------------------------
protected boolean isParentFirst(String text) {
- return text != null && text.equalsIgnoreCase("parent-first");
+ return text == null || text.equalsIgnoreCase("parent-first");
}
protected boolean isSelfFirst(String text) {
Modified:
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=631412&r1=631411&r2=631412&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
(original)
+++
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
Tue Feb 26 14:49:00 2008
@@ -211,7 +211,8 @@
}
private void extractBundle(File installRoot, Bundle bundle, String path)
throws IOException {
- for (Enumeration e = bundle.getEntryPaths(path); e.hasMoreElements();
) {
+ Enumeration e = bundle.getEntryPaths(path);
+ while (e != null && e.hasMoreElements()) {
String entry = (String) e.nextElement();
File fout = new File(installRoot, entry);
if (entry.endsWith("/")) {
