Author: ivaynberg
Date: Fri Dec 4 07:27:41 2009
New Revision: 887089
URL: http://svn.apache.org/viewvc?rev=887089&view=rev
Log:
fix bug
Modified:
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Modified:
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java?rev=887089&r1=887088&r2=887089&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
(original)
+++
wicket/branches/wicket-1.4.x/wicket-spring/src/main/java/org/apache/wicket/spring/SpringWebApplicationFactory.java
Fri Dec 4 07:27:41 2009
@@ -140,7 +140,7 @@
}
String beanName =
filter.getFilterConfig().getInitParameter("applicationBean");
- return createApplication(additionalContext, beanName);
+ return createApplication((additionalContext != null) ?
additionalContext : ac, beanName);
}
private WebApplication createApplication(ApplicationContext ac, String
beanName)
