ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [24/50] incubator-ignite git commit: ignite-327: enable OptimizedMarshaller for another JDKs
Date Tue, 05 May 2015 06:57:10 GMT
ignite-327: enable OptimizedMarshaller for another JDKs


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

Branch: refs/heads/ignite-157-2
Commit: 3344b09b2ceb9e7489fbb32ee3648832e698bd69
Parents: ef9b2d9
Author: Artem Shutak <ashutak@gridgain.com>
Authored: Wed Apr 29 20:55:54 2015 +0300
Committer: Artem Shutak <ashutak@gridgain.com>
Committed: Wed Apr 29 20:55:54 2015 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/internal/IgnitionEx.java  | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3344b09b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 58a8c8d..9453791 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1775,15 +1775,7 @@ public class IgnitionEx {
             Marshaller marsh = myCfg.getMarshaller();
 
             if (marsh == null) {
-                if (!U.isHotSpot()) {
-                    U.warn(log, "OptimizedMarshaller is not supported on this JVM " +
-                        "(only Java HotSpot VMs are supported). Switching to standard JDK
marshalling - " +
-                        "object serialization performance will be significantly slower.",
-                        "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot
VM release.");
-
-                    marsh = new JdkMarshaller();
-                }
-                else if (!OptimizedMarshaller.available()) {
+                if (!OptimizedMarshaller.available()) {
                     U.warn(log, "OptimizedMarshaller is not supported on this JVM " +
                         "(only recent 1.6 and 1.7 versions HotSpot VMs are supported). "
+
                         "To enable fast marshalling upgrade to recent 1.6 or 1.7 HotSpot
VM release. " +


Mime
View raw message