You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by rm...@apache.org on 2011/01/19 13:12:35 UTC
svn commit: r1060781 -
/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
Author: rmatthews
Date: Wed Jan 19 12:12:35 2011
New Revision: 1060781
URL: http://svn.apache.org/viewvc?rev=1060781&view=rev
Log:
Guard to prevent warnings from being repeated went on to allow rest of method to run causing an NPE. Guard now allows returns, but only logs once.
Modified:
incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
Modified: incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java?rev=1060781&r1=1060780&r2=1060781&view=diff
==============================================================================
--- incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java (original)
+++ incubator/isis/trunk/alternatives/security/file/src/main/java/org/apache/isis/alternatives/security/file/authorization/FileAuthorizor.java Wed Jan 19 12:12:35 2011
@@ -247,9 +247,11 @@ public class FileAuthorizor extends Auth
private void writeMap() {
try {
OutputStream whiteListOutputResource = resourceStreamSource.writeResource(whiteListResourceName);
- if (whiteListOutputResource == null && !printedWarning) {
- LOG.warn("unable to write out authorisation details");
- printedWarning = true; // just to stop flooding log
+ if (whiteListOutputResource == null) {
+ if (!printedWarning) {
+ LOG.warn("unable to write out authorisation details");
+ printedWarning = true; // just to stop flooding log
+ }
return;
}
if (LOG.isDebugEnabled() && !printedDebug) {