You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/09/07 11:17:30 UTC
[45/50] [abbrv] ignite git commit: Finalization.
Finalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d712d2a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d712d2a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d712d2a5
Branch: refs/heads/ignite-2649
Commit: d712d2a57a56e85402a2cbe30873f3d9b7b293d6
Parents: 5d1a2ed
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Sep 7 14:03:53 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Sep 7 14:03:53 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheUtils.java | 13 -------------
.../cache/query/jdbc/GridCacheQueryJdbcTask.java | 4 +---
2 files changed, 1 insertion(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d712d2a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 0a005ca..138ed81 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -91,7 +91,6 @@ import org.apache.ignite.lang.IgniteInClosure;
import org.apache.ignite.lang.IgnitePredicate;
import org.apache.ignite.lang.IgniteReducer;
import org.apache.ignite.lifecycle.LifecycleAware;
-import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.plugin.CachePluginConfiguration;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
@@ -1891,16 +1890,4 @@ public class GridCacheUtils {
? DEFAULT_TX_CFG
: cfg.getTransactionConfiguration();
}
-
- /**
- * Marshal object.
- *
- * @param ctx Shared context.
- * @param obj Object.
- * @return Result.
- * @throws IgniteCheckedException If failed.
- */
- public static byte[] marshal(GridCacheSharedContext ctx, Object obj) throws IgniteCheckedException {
- return ctx.marshaller().marshal(obj);
- }
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/d712d2a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
index 5b973da..5c60762 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
@@ -74,7 +74,6 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
/** Scheduler. */
private static final ScheduledExecutorService SCHEDULER = Executors.newScheduledThreadPool(1);
- /** Ignite instance. */
@IgniteInstanceResource
private Ignite ignite;
@@ -136,8 +135,7 @@ public class GridCacheQueryJdbcTask extends ComputeTaskAdapter<byte[], byte[]> {
else {
status = 1;
- bytes = MARSHALLER.marshal(new SQLException(res.getException().getMessage())
- );
+ bytes = MARSHALLER.marshal(new SQLException(res.getException().getMessage()));
}
byte[] packet = new byte[bytes.length + 1];