Author: psharples
Date: Fri Aug 26 13:01:29 2011
New Revision: 1162097
URL: http://svn.apache.org/viewvc?rev=1162097&view=rev
Log:
In the build.properties file, if you have the "include.extra.features"
commented out then the "features" folder does not seem to be created in the web
app itself. If this is the case, then further down in this method a
"featuresFolder.listFiles()" call can cause a null pointer exception. So to fix
- if the folder doesn't exist, then exit.
Modified:
incubator/wookie/trunk/src/org/apache/wookie/feature/Features.java
Modified: incubator/wookie/trunk/src/org/apache/wookie/feature/Features.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/feature/Features.java?rev=1162097&r1=1162096&r2=1162097&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/feature/Features.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/feature/Features.java Fri Aug
26 13:01:29 2011
@@ -114,6 +114,9 @@ public class Features {
// Create a new ArrayList if it hasn't been instantiated
//
if (features == null) features = new ArrayList<IFeature>();
+
+ // Sanity check
+ if(!featuresFolder.exists()){return;}
//
// Iterate over child folders of the /features folder
