ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [39/50] [abbrv] incubator-ignite git commit: # IGNITE-141 - Minor
Date Wed, 11 Mar 2015 09:54:12 GMT
# IGNITE-141 - Minor


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/697d1999
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/697d1999
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/697d1999

Branch: refs/heads/ignite-368
Commit: 697d19997ecb213a4d5b5dd2538dc5d636e459f5
Parents: c5355cd
Author: Valentin Kulichenko <vkulichenko@gridgain.com>
Authored: Tue Mar 10 17:51:09 2015 -0700
Committer: Valentin Kulichenko <vkulichenko@gridgain.com>
Committed: Tue Mar 10 17:51:09 2015 -0700

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/MarshallerContextImpl.java | 6 ++++--
 .../marshaller/optimized/OptimizedObjectInputStream.java       | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/697d1999/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 6a2d92c..6d2520e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -47,10 +47,12 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
     /** {@inheritDoc} */
     @Override protected boolean registerClassName(int id, String clsName) {
         try {
-            if (cache == null)
+            GridCacheAdapter<Integer, String> cache0 = cache;
+
+            if (cache0 == null)
                 return false;
 
-            String old = cache.putIfAbsent(id, clsName);
+            String old = cache0.putIfAbsent(id, clsName);
 
             if (old != null && !old.equals(clsName))
                 throw new IgniteException("Type ID collision occurred in OptimizedMarshaller.
Use " +

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/697d1999/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
index 987b676..23af9f1 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/OptimizedObjectInputStream.java
@@ -244,7 +244,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
                 int typeId = readInt();
 
                 OptimizedClassDescriptor desc = typeId == 0 ?
-                    classDescriptor(Class.forName(readUTF(), true, clsLdr), ctx, mapper):
+                    classDescriptor(U.forName(readUTF(), clsLdr), ctx, mapper):
                     classDescriptor(typeId, clsLdr, ctx, mapper);
 
                 curCls = desc.describedClass();
@@ -274,7 +274,7 @@ class OptimizedObjectInputStream extends ObjectInputStream {
     private Class<?> readClass() throws ClassNotFoundException, IOException {
         int compTypeId = readInt();
 
-        return compTypeId == 0 ? Class.forName(readUTF(), false, clsLdr) :
+        return compTypeId == 0 ? U.forName(readUTF(), clsLdr) :
             classDescriptor(compTypeId, clsLdr, ctx, mapper).describedClass();
     }
 


Mime
View raw message