svn commit: r465076 - /cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/components/BlockSource.java

[da...@apache.org]

Author: danielf
Date: Tue Oct 17 15:14:50 2006
New Revision: 465076

URL: http://svn.apache.org/viewvc?view=rev&rev=465076
Log:
NPE in ResourceReader when InputSource returns null on getURI (COCOON-1935). Due to Alexander Klimetschek. Also sat the system id to something better than null (the block uri). The value still isn't globaly valid (or necessarily unique).

Modified:
    cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/components/BlockSource.java

Modified: cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/components/BlockSource.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/components/BlockSource.java?view=diff&rev=465076&r1=465075&r2=465076
==============================================================================
--- cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/components/BlockSource.java (original)
+++ cocoon/trunk/core/cocoon-blocks-fw/cocoon-blocks-fw-impl/src/main/java/org/apache/cocoon/blocks/components/BlockSource.java Tue Oct 17 15:14:50 2006
@@ -34,8 +34,12 @@
 public class BlockSource extends AbstractSource {
     
     private BlockConnection blockConnection;
-
+    
     public BlockSource(String location, Logger logger) throws IOException {
+        // the systemId (returned by getURI()) is by default null
+        // using the block uri is a little bit questionable as it only is valid
+        // whithin the current block, not globally
+        setSystemId(location);
         this.blockConnection = new BlockConnection(location, logger);
         this.blockConnection.connect();
     }