Author: pete
Date: Thu Jun 30 12:29:07 2011
New Revision: 1141507
URL: http://svn.apache.org/viewvc?rev=1141507&view=rev
Log:
WICKET-3850 Use of Application inside PropertiesFactory is inconsistent
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java?rev=1141507&r1=1141506&r2=1141507&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java
Thu Jun 30 12:29:07 2011
@@ -142,7 +142,7 @@ public class PropertiesFactory implement
if (properties == null)
{
- IResourceSettings resourceSettings =
Application.get().getResourceSettings();
+ IResourceSettings resourceSettings =
application.getResourceSettings();
Iterator<IPropertiesLoader> iter =
propertiesLoader.iterator();
while ((properties == null) && iter.hasNext())