Author: fmeschbe
Date: Thu Jun 5 03:00:05 2008
New Revision: 663513
URL: http://svn.apache.org/viewvc?rev=663513&view=rev
Log:
SLING-512 Do not use default methods if the sling.servlet.extensions property
is declared
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java
Modified:
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java?rev=663513&r1=663512&r2=663513&view=diff
==============================================================================
---
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java
(original)
+++
incubator/sling/trunk/servlets/resolver/src/main/java/org/apache/sling/servlets/resolver/resource/ServletResourceProviderFactory.java
Thu Jun 5 03:00:05 2008
@@ -146,12 +146,17 @@
// handle the methods property specially (SLING-430)
String[] methods =
OsgiUtil.toStringArray(ref.getProperty(SLING_SERVLET_METHODS));
if (methods == null || methods.length == 0) {
- if (log.isInfoEnabled()) {
- log.info(
- "addByType({}): No methods declared, assuming GET/HEAD",
- getServiceIdentifier(ref));
+
+ // SLING-512 only, set default methods if no extensions are
declared
+ if (extensions == null || extensions.length == 0) {
+ if (log.isInfoEnabled()) {
+ log.info(
+ "addByType({}): No methods declared, assuming
GET/HEAD",
+ getServiceIdentifier(ref));
+ }
+ methods = DEFAULT_SERVLET_METHODS;
}
- methods = DEFAULT_SERVLET_METHODS;
+
} else if (methods.length == 1 && ALL_METHODS.equals(methods[0])) {
if (log.isInfoEnabled()) {
log.info("addByType({}): Assuming all methods for '*'",
