You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/02/24 11:27:37 UTC
[5/6] ignite git commit: IGNITE-2683 fixes (cherry picked from commit
409f525)
IGNITE-2683 fixes
(cherry picked from commit 409f525)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/06c511cc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06c511cc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06c511cc
Branch: refs/heads/ignite-2683-quashed
Commit: 06c511cc5289272cd205ebdc526366642f6a5f84
Parents: 37d1d5b
Author: Anton Vinogradov <av...@apache.org>
Authored: Sat Feb 20 14:37:35 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Wed Feb 24 13:19:42 2016 +0300
----------------------------------------------------------------------
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java | 2 +-
.../tests/p2p/CacheDeploymentExternalizableTestValue.java | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/06c511cc/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 41815d5..103ea9e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -2205,7 +2205,7 @@ public abstract class IgniteUtils {
public static ClassLoader resolveClassLoader(ClassLoader ldr, IgniteConfiguration cfg) {
assert cfg != null;
- return (ldr != null & ldr != gridClassLoader) ?
+ return (ldr != null && ldr != gridClassLoader) ?
ldr :
cfg.getClassLoader() != null ?
cfg.getClassLoader() :
http://git-wip-us.apache.org/repos/asf/ignite/blob/06c511cc/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentExternalizableTestValue.java
----------------------------------------------------------------------
diff --git a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentExternalizableTestValue.java b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentExternalizableTestValue.java
index 573ad61..c5c0b4d 100644
--- a/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentExternalizableTestValue.java
+++ b/modules/extdata/p2p/src/main/java/org/apache/ignite/tests/p2p/CacheDeploymentExternalizableTestValue.java
@@ -31,20 +31,21 @@ public class CacheDeploymentExternalizableTestValue implements Serializable {
private CacheDeploymentExternalizableTestValue2 field;
/**
- * @return
+ * @return value
*/
public CacheDeploymentExternalizableTestValue2 getField() {
return field;
}
/**
- * @param field
+ * @param field field
*/
public void setField(
CacheDeploymentExternalizableTestValue2 field) {
this.field = field;
}
+ /** {@inheritDoc} */
@Override public String toString() {
field = new CacheDeploymentExternalizableTestValue2();