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/20 12:37:54 UTC
[1/2] ignite git commit: IGNITE-2683 fixes
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.7 b8beea91e -> feab7130b
IGNITE-2683 fixes
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/409f5257
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/409f5257
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/409f5257
Branch: refs/heads/ignite-1.5.7
Commit: 409f52571254e5abbb7714f50eb4ce809736d3b2
Parents: 80dd057
Author: Anton Vinogradov <av...@apache.org>
Authored: Sat Feb 20 14:37:35 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Sat Feb 20 14:37:35 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/409f5257/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 ec31cbf..2faef3d 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
@@ -2208,7 +2208,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/409f5257/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();
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.5.7' into ignite-1.5.7
Posted by av...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.5.7' into ignite-1.5.7
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/feab7130
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/feab7130
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/feab7130
Branch: refs/heads/ignite-1.5.7
Commit: feab7130bc2b166527c80e8e55f20575047e4fef
Parents: 409f525 b8beea9
Author: Anton Vinogradov <av...@apache.org>
Authored: Sat Feb 20 14:37:50 2016 +0300
Committer: Anton Vinogradov <av...@apache.org>
Committed: Sat Feb 20 14:37:50 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------