You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2015/03/03 02:15:15 UTC
[2/7] incubator-ignite git commit: Merge branch 'ignite-141' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-141
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/71f403a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/71f403a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/71f403a3
Branch: refs/heads/ignite-141
Commit: 71f403a31251844a7fa4f52585052222e65c55c5
Parents: 70d4b90 fb13a9a
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Mon Mar 2 15:47:10 2015 -0800
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Mon Mar 2 15:47:10 2015 -0800
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 52 +++++
.../ignite/internal/IgniteTransactionsEx.java | 16 --
.../processors/cache/GridCacheAdapter.java | 16 +-
.../cache/GridCacheSharedContext.java | 6 +
.../dht/GridDhtTransactionalCacheAdapter.java | 4 +-
.../dht/colocated/GridDhtColocatedCache.java | 2 +-
.../near/GridNearTransactionalCache.java | 4 +-
.../transactions/IgniteTransactionsImpl.java | 36 +---
.../cache/transactions/IgniteTxHandler.java | 8 +-
.../cache/transactions/IgniteTxManager.java | 125 ++++++++++--
.../IgniteCacheSystemTransactionsSelfTest.java | 188 +++++++++++++++++++
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 +
.../processors/cache/jta/CacheJtaManager.java | 4 +-
13 files changed, 382 insertions(+), 80 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71f403a3/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index a6a5bde,4143457..b69821f
--- 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,4 -2716,53 +2716,56 @@@ public class IgniteKernal implements Ig
@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
}