Author: ron.sigal(a)jboss.com
Date: 2008-03-07 00:04:56 -0500 (Fri, 07 Mar 2008)
New Revision: 3584
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingMarshaller.java
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingUnMarshaller.java
Log:
JBREM-698: Returns preferred stream unchanged.
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingMarshaller.java
===================================================================
---
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingMarshaller.java 2008-03-07
04:52:56 UTC (rev 3583)
+++
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingMarshaller.java 2008-03-07
05:04:56 UTC (rev 3584)
@@ -110,7 +110,11 @@
cipher = EncryptionManager.getCipher(Cipher.ENCRYPT_MODE, this.cipherAlgorithm);
}
-
+ public OutputStream getMarshallingStream(OutputStream outputStream) throws
IOException
+ {
+ return outputStream;
+ }
+
/**
* Writes encrypted, marshalled form of <code>dataObject</code> to
<code>output</code>.
*
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingUnMarshaller.java
===================================================================
---
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingUnMarshaller.java 2008-03-07
04:52:56 UTC (rev 3583)
+++
remoting2/branches/2.x/src/main/org/jboss/remoting/marshal/encryption/EncryptingUnMarshaller.java 2008-03-07
05:04:56 UTC (rev 3584)
@@ -100,6 +100,11 @@
cipher = EncryptionManager.getCipher(Cipher.DECRYPT_MODE, this.cipherAlgorithm);
}
+ public InputStream getMarshallingStream(InputStream inputStream) throws IOException
+ {
+ return inputStream;
+ }
+
/**
* Restores a encrypted, marshalled form of an object to its original state.
*