svn commit: r1154286 - /incubator/wookie/trunk/src/org/apache/wookie/feature/Features.java

[scottbw]

Author: scottbw
Date: Fri Aug  5 16:12:55 2011
New Revision: 1154286

URL: http://svn.apache.org/viewvc?rev=1154286&view=rev
Log:
Removed a debug statement, and moved clearing of existing features into the 
main Load method so its called during testing as well as when invoked using the 
servlet context.

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=1154286&r1=1154285&r2=1154286&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  
5 16:12:55 2011
@@ -85,13 +85,10 @@ public class Features {
    */
   public static void loadFeatures(ServletContext context){
     
-    featuresFolder = new File(context.getRealPath(DEFAULT_FEATURE_FOLDER));
-    System.out.println(featuresFolder.list());
-    
     //
-    // Clear any existing installed features
+    // Create a file for the features folder in the server filesystem
     //
-    features = new ArrayList<IFeature>();
+    featuresFolder = new File(context.getRealPath(DEFAULT_FEATURE_FOLDER));
     
     //
     // Load features from file
@@ -109,6 +106,11 @@ public class Features {
     featuresFolder = theFeaturesFolder;
     
     //
+    // Clear any existing installed features
+    //
+    features = new ArrayList<IFeature>();
+    
+    //
     // Create a new ArrayList if it hasn't been instantiated
     //
     if (features == null) features = new ArrayList<IFeature>();