You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by pp...@apache.org on 2007/01/24 00:06:30 UTC
svn commit: r499179 - in
/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa:
event/TCPRemoteCommitProvider.java util/Serialization.java
Author: ppoddar
Date: Tue Jan 23 15:06:29 2007
New Revision: 499179
URL: http://svn.apache.org/viewvc?view=rev&rev=499179
Log:
TCP RemoteCommitProviders deserializes by input streams that are smart in resolving classes.
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/TCPRemoteCommitProvider.java
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/TCPRemoteCommitProvider.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/TCPRemoteCommitProvider.java?view=diff&rev=499179&r1=499178&r2=499179
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/TCPRemoteCommitProvider.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/event/TCPRemoteCommitProvider.java Tue Jan 23 15:06:29 2007
@@ -45,6 +45,7 @@
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.util.GeneralException;
import org.apache.openjpa.util.InternalException;
+import org.apache.openjpa.util.Serialization;
import org.apache.openjpa.lib.util.concurrent.ReentrantLock;
import serp.util.Strings;
@@ -660,7 +661,8 @@
throws IOException, ClassNotFoundException,
OptionalDataException {
// This will block waiting for the next
- ObjectInputStream ois = new ObjectInputStream(in);
+ ObjectInputStream ois =
+ new Serialization.ClassResolvingObjectInputStream(in);
long protocolVersion = ois.readLong();
if (protocolVersion != PROTOCOL_VERSION) {
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java?view=diff&rev=499179&r1=499178&r2=499179
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/Serialization.java Tue Jan 23 15:06:29 2007
@@ -86,7 +86,7 @@
/**
* Object output stream that replaces persistent objects with their oids.
*/
- private static class PersistentObjectOutputStream
+ public static class PersistentObjectOutputStream
extends ObjectOutputStream {
private StoreContext _ctx;
@@ -108,7 +108,7 @@
}
}
- private static class ClassResolvingObjectInputStream
+ public static class ClassResolvingObjectInputStream
extends ObjectInputStream {
public ClassResolvingObjectInputStream(InputStream delegate)
@@ -134,7 +134,7 @@
/**
* Object input stream that replaces oids with their objects.
*/
- private static class PersistentObjectInputStream
+ public static class PersistentObjectInputStream
extends ClassResolvingObjectInputStream {
private final StoreContext _ctx;