You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by da...@apache.org on 2006/10/18 00:16:04 UTC
svn commit: r465077 -
/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java
Author: danielf
Date: Tue Oct 17 15:16:03 2006
New Revision: 465077
URL: http://svn.apache.org/viewvc?view=rev&rev=465077
Log:
Avoid NPE in ResourceReader when InputSource returns null on getURI (COCOON-1935). Due to Alexander Klimetschek.
Modified:
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java
Modified: cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java?view=diff&rev=465077&r1=465076&r2=465077
==============================================================================
--- cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java (original)
+++ cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/reading/ResourceReader.java Tue Oct 17 15:16:03 2006
@@ -238,7 +238,9 @@
}
final String systemId = (String) documents.get(request.getRequestURI());
- if (systemId == null || inputSource.getURI().equals(systemId)) {
+ // Note: getURI() might be null in some incomplete implementations
+ final String sourceURI = inputSource.getURI();
+ if (systemId == null || (sourceURI != null && sourceURI.equals(systemId))) {
return inputSource.getLastModified();
}