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 2006/11/14 19:23:31 UTC
svn commit: r474905 -
/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java
Author: andreas
Date: Tue Nov 14 10:23:30 2006
New Revision: 474905
URL: http://svn.apache.org/viewvc?view=rev&rev=474905
Log:
Avoid NPE for non-existing AggregatingSource
Modified:
lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java
Modified: lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java?view=diff&rev=474905&r1=474904&r2=474905
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java (original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/cocoon/source/AggregatingSource.java Tue Nov 14 10:23:30 2006
@@ -86,19 +86,21 @@
protected byte[] getData() {
if (this.data == null) {
Document dom = getDom();
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- try {
- DocumentHelper.writeDocument(dom, out);
- } catch (Exception e) {
- throw new RuntimeException(e);
+ if (dom != null) {
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ try {
+ DocumentHelper.writeDocument(dom, out);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ this.data = out.toByteArray();
}
- this.data = out.toByteArray();
}
return this.data;
}
public boolean exists() {
- return getData().length > 0;
+ return getData() != null;
}
public long getContentLength() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org