maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r366515 - /maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Date Fri, 06 Jan 2006 15:17:38 GMT
Author: evenisse
Date: Fri Jan  6 07:17:28 2006
New Revision: 366515

URL: http://svn.apache.org/viewcvs?rev=366515&view=rev
Log:
Fix NPE

Modified:
    maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

Modified: maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: http://svn.apache.org/viewcvs/maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=366515&r1=366514&r2=366515&view=diff
==============================================================================
--- maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
(original)
+++ maven/doxia/trunk/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
Fri Jan  6 07:17:28 2006
@@ -330,7 +330,18 @@
 
     private static String getParentPrefix( String parentUrl, String childUrl )
     {
+        if ( parentUrl == null )
+        {
+            parentUrl = "";
+        }
+
+        if ( childUrl == null )
+        {
+            childUrl = "";
+        }
+
         String prefix = parentUrl;
+
         if ( childUrl.startsWith( parentUrl ) )
         {
             prefix = getRelativePath( childUrl, parentUrl );



Mime
View raw message