svn commit: r1345962 - /myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java

[lu...@apache.org]

Author: lu4242
Date: Mon Jun  4 13:35:48 2012
New Revision: 1345962

URL: http://svn.apache.org/viewvc?rev=1345962&view=rev
Log:
MYFACES-3526 NullPointerException on javax.faces.application.Resource.toString when using -Dsun.io.serialization.extendedDebugInfo=true 

Modified:
    myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java

Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java?rev=1345962&r1=1345961&r2=1345962&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeResouceWrapper.java Mon Jun  4 13:35:48 2012
@@ -54,13 +54,13 @@ public final class CompositeResouceWrapp
         super();
     }
     
-    public CompositeResouceWrapper(Resource _delegate)
+    public CompositeResouceWrapper(Resource delegate)
     {
         super();
-        this._delegate = _delegate;
-        setResourceName(_delegate.getResourceName());
-        setLibraryName(_delegate.getLibraryName());
-        setContentType(_delegate.getContentType());
+        this._delegate = delegate;
+        setResourceName(delegate.getResourceName());
+        setLibraryName(delegate.getLibraryName());
+        setContentType(delegate.getContentType());
     }
 
 
@@ -116,4 +116,14 @@ public final class CompositeResouceWrapp
         out.writeObject(getLibraryName());
         out.writeObject(getContentType());
     }
+    
+    @Override
+    public String toString()
+    {
+        // Delegate resource in this case could not be available in serialization, or
+        // serialization could happen in other context. So it is better to return
+        // a simple String representing the object without go into delegation.
+        return ( (getLibraryName() != null) ? getLibraryName() : "") + ":"+ 
+               ( (getResourceName() != null) ? getResourceName() : "") ;
+    }
 }