svn commit: r903633 - /incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java

[scottbw]

Author: scottbw
Date: Wed Jan 27 13:35:27 2010
New Revision: 903633

URL: http://svn.apache.org/viewvc?rev=903633&view=rev
Log:
Moved the hot-deploy watcher to the end of the init process, otherwise it can 
get into a race with the Feature loader

Modified:
    incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java

Modified: 
incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java
URL: 
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java?rev=903633&r1=903632&r2=903633&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java 
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/server/ContextListener.java 
Wed Jan 27 13:35:27 2010
@@ -84,12 +84,6 @@
                        LocaleHandler.getInstance().initialize(configuration);
                        final Locale locale = new 
Locale(configuration.getString("widget.default.locale"));
                        final Messages localizedMessages = 
LocaleHandler.getInstance().getResourceBundle(locale);
-       
-                       if (configuration.getBoolean("widget.hot_deploy")) {
-                               startWatcher(context, configuration, 
localizedMessages);
-                       } else {
-                               
_logger.info(localizedMessages.getString("WidgetHotDeploy.0"));
-                       }
                        
                        /* 
                         *  load the opensocial.properties file and put it into 
this context
@@ -123,6 +117,15 @@
                                _logger.info("Loading default features, 
configure your local server using: " + localFeaturesPropsFile.toString());
                        }
                        FeatureLoader.loadFeatures(featuresConfiguration);
+                       
+                       /*
+                        * Start hot-deploy widget watcher
+                        */
+                       if (configuration.getBoolean("widget.hot_deploy")) {
+                               startWatcher(context, configuration, 
localizedMessages);
+                       } else {
+                               
_logger.info(localizedMessages.getString("WidgetHotDeploy.0"));
+                       }
                } 
                catch (ConfigurationException ex) {
                        _logger.error("ConfigurationException thrown: "+ 
ex.toString());