You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/01/11 13:00:44 UTC

svn commit: r495203 - in /lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms: cocoon/transformation/UsecaseMenuTransformer.java usecase/UsecaseMessage.java

Author: andreas
Date: Thu Jan 11 04:00:43 2007
New Revision: 495203

URL: http://svn.apache.org/viewvc?view=rev&rev=495203
Log:
Avoid NPE when instantiating UsecaseMessage

Modified:
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
    lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/UsecaseMessage.java

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java?view=diff&rev=495203&r1=495202&r2=495203
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/cocoon/transformation/UsecaseMenuTransformer.java Thu Jan 11 04:00:43 2007
@@ -111,7 +111,7 @@
                             getLogger().debug("Usecase not authorized");
                         }
                         attributes = removeHrefAttribute(attr);
-                        UsecaseMessage message = new UsecaseMessage("Access denied", null);
+                        UsecaseMessage message = new UsecaseMessage("Access denied");
                         messages = Collections.singletonList(message);
                     }
                 }

Modified: lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/UsecaseMessage.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/UsecaseMessage.java?view=diff&rev=495203&r1=495202&r2=495203
==============================================================================
--- lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/UsecaseMessage.java (original)
+++ lenya/trunk/src/modules-core/usecase/java/src/org/apache/lenya/cms/usecase/UsecaseMessage.java Thu Jan 11 04:00:43 2007
@@ -39,7 +39,6 @@
     public UsecaseMessage(String _message) {
         Assert.notNull("message", _message);
         this.message = _message;
-        this.message = _message;
     }
 
     /**
@@ -50,6 +49,7 @@
     public UsecaseMessage(String _message, String[] _params) {
         this(_message);
         
+        Assert.notNull("params", _params);
         for (int i = 0; i < _params.length; i++) {
             Assert.notNull("params[" + i + "]", _params[i]);
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org