ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [11/18] incubator-ignite git commit: # sprint-2 - warning fixes.
Date Fri, 27 Mar 2015 08:55:30 GMT
# sprint-2 - warning fixes.


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

Branch: refs/heads/ignite-611
Commit: 71c69391c6347afd4fb85f5de0168e6b97a31ff6
Parents: 988b6b9
Author: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Authored: Thu Mar 26 21:47:45 2015 -0700
Committer: Dmitiry Setrakyan <dsetrakyan@gridgain.com>
Committed: Thu Mar 26 21:47:45 2015 -0700

----------------------------------------------------------------------
 .../apache/ignite/internal/MarshallerContextImpl.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/71c69391/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 67d703f..17de465 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -65,8 +65,8 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
             old = cache0.tryPutIfAbsent(id, clsName);
 
             if (old != null && !old.equals(clsName)) {
-                U.warn(log, "Type ID collision occurred in marshaller (this can cause performance
degradation). " +
-                    "Use marshaller configuration to resolve it [id=" + id + ", clsName1="
+ clsName +
+                U.quietAndWarn(log, "Type ID collision detected, may affect performance "
+
+                    "(set idMapper property on marshaller to fix) [id=" + id + ", clsName1="
+ clsName +
                     "clsName2=" + old + ']');
 
                 return false;
@@ -77,9 +77,12 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
             return true;
         }
         catch (CachePartialUpdateCheckedException | GridCacheTryPutFailedException e) {
-            if (++failedCnt > 10)
-                U.warn(log, e, "Marshaller failed to register class for more than 10 times
" +
-                    "(this can cause performance degradation).");
+            if (++failedCnt > 10) {
+                U.quietAndWarn(log, e, "Failed to register marshalled class for more than
10 times in a row " +
+                    "(may affect performance)");
+
+                failedCnt = 0;
+            }
 
             return false;
         }


Mime
View raw message