change context listener to throw by default

Author: kares

src/main/java/org/jruby/rack/DefaultRackConfig.java

@@ -253,18 +253,11 @@ public Map<String, String> getRuntimeEnvironment() {
         if ( env == null ) env = getProperty("jruby.runtime.environment");
         final Object envFlag = toStrictBoolean(env, null);
         if ( envFlag != null ) {
-            boolean keep = ((Boolean) envFlag).booleanValue();
             // jruby.runtime.env = true keep as is (return null)
             // jruby.runtime.env = false clear env (return empty)
-            //return keep ? null : new HashMap<String, String>();
-            if ( keep ) {
-                return new HashMap<String, String>(System.getenv());
-            }
-            else {
-                return new HashMap<String, String>();
-            }
+            return (Boolean) envFlag ? new HashMap<>(System.getenv()) : new HashMap<>();
         }
-        if ( isIgnoreEnvironment() ) return new HashMap<String, String>();
+        if ( isIgnoreEnvironment() ) return new HashMap<>();
         // TODO maybe support custom value 'servlet' to use init params ?
         return toStringMap(env);
     }
@@ -289,14 +282,14 @@ public boolean isThrowInitException() {
 
     static boolean isThrowInitException(RackConfig config) {
         Boolean error = config.getBooleanProperty("jruby.rack.error");
-        if ( error != null && ! error.booleanValue() ) {
-            return true; // jruby.rack.error = false
+        if ( error != null && error.booleanValue() ) {
+            return false; // jruby.rack.error = true
         }
-        error = config.getBooleanProperty("jruby.rack.exception");
-        if ( error != null && ! error.booleanValue() ) {
-            return true; // jruby.rack.exception = false
+        error = config.getBooleanProperty(RackEnvironment.EXCEPTION);
+        if ( error != null && error.booleanValue() ) {
+            return false; // jruby.rack.exception = true
         }
-        return false;
+        return true;
     }
 
     @Override
@@ -421,7 +414,7 @@ private Map<String, String> toStringMap(final String env) {
     }
 
     private static Map<String,String> getLoggerTypes() {
-        final Map<String,String> loggerTypes = new HashMap<String, String>(8);
+        final Map<String,String> loggerTypes = new HashMap<>(8);
         loggerTypes.put("commons_logging", "org.jruby.rack.logging.CommonsLoggingLogger");
         loggerTypes.put("clogging", "org.jruby.rack.logging.CommonsLoggingLogger");
         loggerTypes.put("slf4j", "org.jruby.rack.logging.Slf4jLogger");

src/main/java/org/jruby/rack/RackServletContextListener.java

@@ -50,7 +50,7 @@ public void contextInitialized(final ServletContextEvent event) {
         try {
             factory.init(rackContext);
         } 
-        catch (RuntimeException e) {
+        catch (Exception e) {
             handleInitializationException(e, factory, rackContext);
         }
     }
@@ -71,7 +71,7 @@ protected RackApplicationFactory newApplicationFactory(RackConfig config) {
 
         final RackApplicationFactory factory = new DefaultRackApplicationFactory();
         final Integer maxRuntimes = config.getMaximumRuntimes();
-        // for backwards compatibility when runtime mix/max values not specified
+        // for backwards compatibility when runtime min/max values not specified
         // we assume a single shared (threadsafe) runtime to be used :
         if ( maxRuntimes == null || maxRuntimes.intValue() == 1 ) {
             return new SharedRackApplicationFactory(factory);
@@ -87,7 +87,6 @@ protected void handleInitializationException(
             final Exception e,
             final RackApplicationFactory factory,
             final ServletRackContext rackContext) {
-        // TODO for backwards compat we do not throw (by default) but should :
         if ( isThrowInitException(rackContext.getConfig()) ) {
             if (e instanceof RuntimeException) {
                 throw (RuntimeException) e;

src/spec/ruby/rack/servlet_context_listener_spec.rb

@@ -33,20 +33,19 @@
       @listener.contextInitialized servlet_context_event
     end
 
-    it "logs an error if initialization failed" do
-      @factory.should_receive(:init).and_raise org.jruby.rack.RackInitializationException, "help"
-      @servlet_context.should_receive(:log) do |level, message, error|
-        level == 'ERROR' && message =~ /initialization failed/ && error.message == 'help'
-      end
-      @listener.contextInitialized servlet_context_event
+    it "throws an error if initialization failed" do
+      @servlet_context = org.springframework.mock.web.MockServletContext.new
+      @factory.should_receive(:init).and_raise org.jruby.rack.RackInitializationException.new("help")
+
+      expect { @listener.contextInitialized(servlet_context_event) }.to raise_error(org.jruby.rack.RackInitializationException)
     end
 
-    it "throws an error if initialization failed (and jruby.rack.error = false)" do
+    it "does not throw if initialization failed (and jruby.rack.error = true)" do
       @servlet_context = org.springframework.mock.web.MockServletContext.new
-      @servlet_context.add_init_parameter 'jruby.rack.error', 'false'
+      @servlet_context.addInitParameter 'jruby.rack.error', 'true'
       @factory.should_receive(:init).and_raise org.jruby.rack.RackInitializationException.new("help")
 
-      expect { @listener.contextInitialized servlet_context_event }.to raise_error(org.jruby.rack.RackInitializationException)
+      expect { @listener.contextInitialized(servlet_context_event) }.to_not raise_error
     end
 
   end