ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: ignite-471-2: changes after the review
Date Thu, 04 Jun 2015 07:00:13 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-471-2 5ae5574ce -> 7e3d30b8c


ignite-471-2: changes after the review


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

Branch: refs/heads/ignite-471-2
Commit: 7e3d30b8c4384cb1029ea70e80f4e87f6fe68d48
Parents: 5ae5574
Author: Denis Magda <dmagda@gridgain.com>
Authored: Thu Jun 4 10:00:02 2015 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Thu Jun 4 10:00:02 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgniteKernal.java    | 3 +--
 .../java/org/apache/ignite/marshaller/AbstractMarshaller.java | 5 -----
 .../main/java/org/apache/ignite/marshaller/Marshaller.java    | 7 -------
 3 files changed, 1 insertion(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e3d30b8/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 0f239a1..c4b93b8 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
@@ -644,8 +644,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable
{
                 igfsExecSvc,
                 restExecSvc);
 
-            if (cfg.getMarshaller().getContext() == null)
-                cfg.getMarshaller().setContext(ctx.marshallerContext());
+            cfg.getMarshaller().setContext(ctx.marshallerContext());
 
             startProcessor(new ClusterProcessor(ctx));
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e3d30b8/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
index 54cd9fd..fd08a02 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/AbstractMarshaller.java
@@ -42,11 +42,6 @@ public abstract class AbstractMarshaller implements Marshaller {
     }
 
     /** {@inheritDoc} */
-    @Override public MarshallerContext getContext() {
-        return ctx;
-    }
-
-    /** {@inheritDoc} */
     @Override public byte[] marshal(@Nullable Object obj) throws IgniteCheckedException {
         GridByteArrayOutputStream out = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7e3d30b8/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
index 3b38a63..c25e74e 100644
--- a/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/marshaller/Marshaller.java
@@ -73,13 +73,6 @@ public interface Marshaller {
     public void setContext(MarshallerContext ctx);
 
     /**
-     * Returns {@link MarshallerContext}.
-     *
-     * @return Marshaller context.
-     */
-    public MarshallerContext getContext();
-
-    /**
      * Marshals object to the output stream. This method should not close
      * given output stream.
      *


Mime
View raw message