Author: ron.sigal(a)jboss.com
Date: 2008-04-11 21:11:22 -0400 (Fri, 11 Apr 2008)
New Revision: 3947
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java
Log:
JBREM-934: Several methods check SecurityUtility.skipAccessControl().
Modified:
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java
===================================================================
---
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java 2008-04-12
01:10:24 UTC (rev 3946)
+++
remoting2/branches/2.x/src/main/org/jboss/remoting/serialization/impl/jboss/JBossSerializationManager.java 2008-04-12
01:11:22 UTC (rev 3947)
@@ -28,6 +28,7 @@
import org.jboss.remoting.serialization.IMarshalledValue;
import org.jboss.remoting.serialization.SerializationManager;
import org.jboss.remoting.serialization.SerializationStreamFactory;
+import org.jboss.remoting.util.SecurityUtility;
import org.jboss.serial.io.JBossObjectInputStream;
import org.jboss.serial.io.JBossObjectOutputStream;
import org.jboss.serial.util.StringUtilBuffer;
@@ -58,6 +59,11 @@
{
if (trace) { log.trace(this + " creating JBossObjectInputStream"); }
+ if (SecurityUtility.skipAccessControl())
+ {
+ return new JBossObjectInputStream(input, loader, new StringUtilBuffer(10024,
10024));
+ }
+
try
{
return (ObjectInputStream)AccessController.doPrivileged( new
PrivilegedExceptionAction()
@@ -78,6 +84,11 @@
{
if (trace) { log.trace(this + " creating JBossObjectOutputStream"); }
+ if (SecurityUtility.skipAccessControl())
+ {
+ return new JBossObjectOutputStream(output, new StringUtilBuffer(10024, 10024));
+ }
+
try
{
return (ObjectOutputStream)AccessController.doPrivileged( new
PrivilegedExceptionAction()
@@ -117,6 +128,12 @@
public void sendObject(final ObjectOutputStream oos, final Object dataObject, int
version) throws IOException
{
+ if (SecurityUtility.skipAccessControl())
+ {
+ oos.writeObject(dataObject);
+ oos.flush();
+ }
+
try
{
AccessController.doPrivileged( new PrivilegedExceptionAction()
@@ -166,6 +183,11 @@
}
}
+ if (SecurityUtility.skipAccessControl())
+ {
+ return objInputStream.readObject();
+ }
+
try
{
final ObjectInputStream ois = objInputStream;
Show replies by date