Author: lukaszlenart Date: Wed May 22 05:20:45 2013 New Revision: 1485066 URL: http://svn.apache.org/r1485066 Log: WW-3958 Reverts cast to String to satisfy JDK7
Modified: struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java Modified: struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java?rev=1485066&r1=1485065&r2=1485066&view=diff ============================================================================== --- struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java (original) +++ struts/struts2/trunk/plugins/osgi/src/main/java/org/apache/struts2/osgi/OsgiConfigurationProvider.java Wed May 22 05:20:45 2013 @@ -177,7 +177,8 @@ public class OsgiConfigurationProvider i * Checks for "Struts2-Enabled" header in the bundle */ protected boolean shouldProcessBundle(Bundle bundle) { - String strutsEnabled = bundle.getHeaders().get(OsgiHost.OSGI_HEADER_STRUTS_ENABLED); + // Cast to String is required on JDK7 + String strutsEnabled = (String) bundle.getHeaders().get(OsgiHost.OSGI_HEADER_STRUTS_ENABLED); return "true".equalsIgnoreCase(strutsEnabled); }