You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by fm...@apache.org on 2007/11/22 15:43:47 UTC
svn commit: r597415 - in
/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl:
auth/SlingAuthenticator.java filter/SlingServletResolver.java
Author: fmeschbe
Date: Thu Nov 22 06:43:46 2007
New Revision: 597415
URL: http://svn.apache.org/viewvc?rev=597415&view=rev
Log:
Prevent NullPointerException in updated method if there is no configuration available
Modified:
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/SlingServletResolver.java
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java?rev=597415&r1=597414&r2=597415&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/auth/SlingAuthenticator.java Thu Nov 22 06:43:46 2007
@@ -303,6 +303,10 @@
public void updated(Dictionary properties) {
+ if (properties == null) {
+ properties = new Hashtable<String, Object>();
+ }
+
String newCookie = (String) properties.get(PAR_IMPERSONATION_COOKIE_NAME);
if (newCookie == null || newCookie.length() == 0) {
newCookie = DEFAULT_IMPERSONATION_COOKIE;
Modified: incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/SlingServletResolver.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/SlingServletResolver.java?rev=597415&r1=597414&r2=597415&view=diff
==============================================================================
--- incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/SlingServletResolver.java (original)
+++ incubator/sling/trunk/sling/core/src/main/java/org/apache/sling/core/impl/filter/SlingServletResolver.java Thu Nov 22 06:43:46 2007
@@ -254,21 +254,25 @@
public void updated(Dictionary properties) {
- Object pathObject = properties.get(PROP_PATH);
- if (pathObject instanceof String[]) {
- this.path = (String[]) pathObject;
- for (int i = 0; i < this.path.length; i++) {
- // ensure leading slash
- if (!this.path[i].startsWith("/")) {
- this.path[i] = "/" + this.path[i];
- }
- // ensure trailing slash
- if (!this.path[i].endsWith("/")) {
- this.path[i] += "/";
+ // empty path to begin with
+ path = null;
+
+ // from configuration if available
+ if (properties != null) {
+ Object pathObject = properties.get(PROP_PATH);
+ if (pathObject instanceof String[]) {
+ this.path = (String[]) pathObject;
+ for (int i = 0; i < this.path.length; i++) {
+ // ensure leading slash
+ if (!this.path[i].startsWith("/")) {
+ this.path[i] = "/" + this.path[i];
+ }
+ // ensure trailing slash
+ if (!this.path[i].endsWith("/")) {
+ this.path[i] += "/";
+ }
}
}
- } else {
- this.path = null;
}
}