You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/02 13:48:47 UTC
[1/2] incubator-ignite git commit: ignite-471-2: hiding
setPortableContext method
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-471-2 0dac0be26 -> f2a2daae2
ignite-471-2: hiding setPortableContext method
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd94ce28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd94ce28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd94ce28
Branch: refs/heads/ignite-471-2
Commit: bd94ce28d48d254c634724d30b873b505c75917f
Parents: 0dac0be
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 2 14:43:49 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 2 14:43:49 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, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd94ce28/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 c4b93b8..0f239a1 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,7 +644,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
igfsExecSvc,
restExecSvc);
- cfg.getMarshaller().setContext(ctx.marshallerContext());
+ if (cfg.getMarshaller().getContext() == null)
+ cfg.getMarshaller().setContext(ctx.marshallerContext());
startProcessor(new ClusterProcessor(ctx));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd94ce28/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 fd08a02..54cd9fd 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,6 +42,11 @@ 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/bd94ce28/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 c25e74e..3b38a63 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,6 +73,13 @@ 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.
*
[2/2] incubator-ignite git commit: ignite-471-2: removed PLUGINS var
Posted by sb...@apache.org.
ignite-471-2: removed PLUGINS var
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f2a2daae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2a2daae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2a2daae
Branch: refs/heads/ignite-471-2
Commit: f2a2daae2bd19e3ae201eecc2351b509d759ffe4
Parents: bd94ce2
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jun 2 14:46:07 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jun 2 14:46:07 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/testframework/junits/GridAbstractTest.java | 1 -
.../apache/ignite/testframework/junits/IgniteTestResources.java | 4 ----
2 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2a2daae/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 9e46783..f3a9051 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1093,7 +1093,6 @@ public abstract class GridAbstractTest extends TestCase {
cfg.setNodeId(rsrcs.getNodeId());
cfg.setIgniteHome(rsrcs.getIgniteHome());
cfg.setMBeanServer(rsrcs.getMBeanServer());
- cfg.setPluginConfigurations(IgniteTestResources.PLUGINS);
cfg.setPeerClassLoadingEnabled(true);
cfg.setMetricsLogFrequency(0);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2a2daae/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
index 6da6049..68ae64b 100644
--- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
+++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/IgniteTestResources.java
@@ -22,7 +22,6 @@ import org.apache.ignite.internal.processors.resource.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.marshaller.*;
import org.apache.ignite.marshaller.optimized.*;
-import org.apache.ignite.plugin.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.testframework.config.*;
import org.apache.ignite.testframework.junits.logger.*;
@@ -40,9 +39,6 @@ import java.util.concurrent.*;
*/
public class IgniteTestResources {
/** */
- public static PluginConfiguration[] PLUGINS;
-
- /** */
private static final IgniteLogger rootLog = new GridTestLog4jLogger(false);
/** */