incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r760897 - in /incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl: OutputStreamWrapper.java PipelineImpl.java
Date Wed, 01 Apr 2009 14:09:24 GMT
Author: bdelacretaz
Date: Wed Apr  1 14:09:20 2009
New Revision: 760897

URL: http://svn.apache.org/viewvc?rev=760897&view=rev
Log:
SLING-908 - PipelineImpl retrieves the response's OutputStream only if actually needed, so
that error handles can use it otherwise

Added:
    incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java
  (with props)
Modified:
    incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/PipelineImpl.java

Added: incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java?rev=760897&view=auto
==============================================================================
--- incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java
(added)
+++ incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java
Wed Apr  1 14:09:20 2009
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.scripting.xproc.xpl.impl;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/** OutputStream that wraps another one using a method
+ *  that's only called if the wrapped stream is actually
+ *  used.
+ */
+abstract class OutputStreamWrapper extends OutputStream {
+
+  protected abstract OutputStream getWrappedStream() throws IOException;
+  
+  @Override
+  public void close() throws IOException {
+    getWrappedStream().close();
+  }
+
+  @Override
+  public void flush() throws IOException {
+    getWrappedStream().flush();
+  }
+
+  @Override
+  public void write(byte[] arg0, int arg1, int arg2) throws IOException {
+    getWrappedStream().write(arg0, arg1, arg2);
+  }
+
+  @Override
+  public void write(byte[] arg0) throws IOException {
+    getWrappedStream().write(arg0);
+  }
+
+  @Override
+  public void write(int arg0) throws IOException {
+    getWrappedStream().write(arg0);
+  }
+
+}

Propchange: incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/OutputStreamWrapper.java
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision Rev URL

Modified: incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/PipelineImpl.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/PipelineImpl.java?rev=760897&r1=760896&r2=760897&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/PipelineImpl.java
(original)
+++ incubator/sling/trunk/contrib/scripting/xproc/src/main/java/org/apache/sling/scripting/xproc/xpl/impl/PipelineImpl.java
Wed Apr  1 14:09:20 2009
@@ -18,6 +18,7 @@
  */
 package org.apache.sling.scripting.xproc.xpl.impl;
 
+import java.io.IOException;
 import java.io.OutputStream;
 
 import javax.xml.namespace.QName;
@@ -48,7 +49,17 @@
 			}
 			
 			this.getEnv().getCcPipeline().addComponent(new XMLSerializer());
-			OutputStream out = this.getEnv().getSling().getResponse().getOutputStream();
+			
+			// Don't retrieve OutputStream from response until actually writing
+			// to response, so that error handlers can retrieve it without getting
+			// an error
+			final OutputStream out = new OutputStreamWrapper() {
+        @Override
+        protected OutputStream getWrappedStream() throws IOException {
+          return getEnv().getSling().getResponse().getOutputStream();
+        }
+			};
+			
 			this.getEnv().getCcPipeline().setup(out);
 			this.getEnv().getCcPipeline().execute();
 			



Mime
View raw message