You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jspwiki.apache.org by ja...@apache.org on 2009/03/04 23:14:07 UTC

svn commit: r750192 - /incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java

Author: jalkanen
Date: Wed Mar  4 22:14:06 2009
New Revision: 750192

URL: http://svn.apache.org/viewvc?rev=750192&view=rev
Log:
Fixed an issue with jspwiki.properties not being found in certain testcases.

Modified:
    incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java?rev=750192&r1=750191&r2=750192&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/PropertyReader.java Wed Mar  4 22:14:06 2009
@@ -65,6 +65,9 @@
      */
     public static final String  DEFAULT_PROPERTYFILE = "/WEB-INF/jspwiki.properties";
 
+    private static final String SECONDARY_PROPERTYFILE = "/jspwiki.properties";
+    
+    
     private static final String PARAM_VAR_DECLARATION = "var.";
     private static final String PARAM_VAR_IDENTIFIER  = "$";
 
@@ -133,6 +136,9 @@
                         +" defined for this context, using default from "+DEFAULT_PROPERTYFILE);
                 //  Use the default property file.
                 propertyStream = context.getResourceAsStream(DEFAULT_PROPERTYFILE);
+                
+                if( propertyStream == null )
+                    propertyStream = context.getResourceAsStream( SECONDARY_PROPERTYFILE );
             }
             else
             {