[3/7] incubator-ignite git commit: Merge branch 'ignite-141' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141

[vkulichenko]

Merge branch 'ignite-141' of 
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141

Conflicts:
        modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java


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

Branch: refs/heads/ignite-141
Commit: 151e2c31380fdb02e2233842d396f4e4e84b1b26
Parents: 71f403a
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Mon Mar 2 15:47:25 2015 -0800
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Mon Mar 2 15:47:25 2015 -0800

----------------------------------------------------------------------
 .../apache/ignite/internal/IgniteKernal.java    | 52 --------------------
 1 file changed, 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/151e2c31/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java 
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index b69821f..a6a5bde 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -2716,56 +2716,4 @@ public class IgniteKernal implements IgniteEx, 
IgniteMXBean, Externalizable {
     @Override public String toString() {
         return S.toString(IgniteKernal.class, this);
     }
-<<<<<<< HEAD
-=======
-
-    /**
-     */
-    private static class MarshallerContextImpl implements MarshallerContext {
-        /** */
-        private final GridKernalContext ctx;
-
-        /** */
-        private GridCacheAdapter<Integer, String> cache;
-
-        /**
-         * @param ctx Kernal context.
-         */
-        private MarshallerContextImpl(GridKernalContext ctx) {
-            this.ctx = ctx;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void registerClass(int id, String clsName) {
-            if (cache == null)
-                cache = ctx.cache().marshallerCache();
-
-            try {
-                String old = cache.putIfAbsent(id, clsName);
-
-                if (old != null && !old.equals(clsName))
-                    throw new IgniteException("Type ID collision occured in 
OptimizedMarshaller. Use " +
-                        "OptimizedMarshallerIdMapper to resolve it [id=" + id 
+ ", clsName1=" + clsName +
-                        "clsName2=" + old + ']');
-
-            }
-            catch (IgniteCheckedException e) {
-                throw new IgniteException(e);
-            }
-        }
-
-        /** {@inheritDoc} */
-        @Override public String className(int id) {
-            if (cache == null)
-                cache = ctx.cache().marshallerCache();
-
-            try {
-                return cache.get(id);
-            }
-            catch (IgniteCheckedException e) {
-                throw U.convertException(e);
-            }
-        }
-    }
->>>>>>> fb13a9a0d7b35f6249fa06548bbf871e7294e1d4
 }