IGNITE-471 - Marshalling refactoring

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

Branch: refs/heads/ignite-471
Commit: 19a14bb035d543abfd149fb028c7afae95944aa4
Parents: 42e5759
Author: Valentin Kulichenko <[email protected]>
Authored: Mon Apr 6 11:29:49 2015 -0700
Committer: Valentin Kulichenko <[email protected]>
Committed: Mon Apr 6 11:29:49 2015 -0700

----------------------------------------------------------------------
 .../internal/processors/cache/GridCacheAdapter.java |  2 +-
 .../apache/ignite/internal/util/IgniteUtils.java    |  3 +++
 modules/indexing/pom.xml                            | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a14bb0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 82a5f9c..ecf48e7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -5492,7 +5492,7 @@ public abstract class GridCacheAdapter<K, V> implements 
GridCache<K, V>,
         @Override public void readExternal(ObjectInput in) throws IOException, 
ClassNotFoundException {
             super.readExternal(in);
 
-            keys = (Set<K>) in.readObject();
+            keys = (Set<K>)in.readObject();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a14bb0/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index f4f2d65..3aa71f7 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -7854,6 +7854,9 @@ public abstract class IgniteUtils {
         if (cls != null)
             return cls;
 
+        if (ldr == null)
+            ldr = gridClassLoader;
+
         ConcurrentMap<String, Class> ldrMap = classCache.get(ldr);
 
         if (ldrMap == null) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/19a14bb0/modules/indexing/pom.xml
----------------------------------------------------------------------
diff --git a/modules/indexing/pom.xml b/modules/indexing/pom.xml
index 5851e66..ca9eb21 100644
--- a/modules/indexing/pom.xml
+++ b/modules/indexing/pom.xml
@@ -93,4 +93,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

Reply via email to