Merge remote-tracking branch 'jeichar/improvement/regions' into geoca…

…t_trunk
geonetwork · Nov 15, 2012 · 263836e · 263836e
2 parents e5a99a9 + 246c6ed
commit 263836e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/jeeves/src/main/java/jeeves/config/springutil/GeonetworkFilterSecurityInterceptor.java b/jeeves/src/main/java/jeeves/config/springutil/GeonetworkFilterSecurityInterceptor.java
@@ -39,7 +39,7 @@ public void invoke(FilterInvocation fi) throws IOException, ServletException {
             }
 
             InterceptorStatusToken token = super.beforeInvocation(fi);
-            if (fi.getRequest() != null) {
+            if (fi.getRequest() != null && token != null) {
             	fi.getRequest().setAttribute(GN_SECURITY_ACCEPTED, Boolean.TRUE);
             }