You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/10/29 00:21:51 UTC
[1/2] incubator-geode git commit: GEODE-1098: Fix gfsh.bat error with
default Java installation
Repository: incubator-geode
Updated Branches:
refs/heads/develop 2ef50b24d -> 29bb98a23
GEODE-1098: Fix gfsh.bat error with default Java installation
Paths to JAR dependencies quoted to prevent spaces from causing error
This closes #227
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/dbcbd55f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/dbcbd55f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/dbcbd55f
Branch: refs/heads/develop
Commit: dbcbd55f9b2965afcf5dcc8453308c1c850d7a5c
Parents: 2ef50b2
Author: mmurdoch <ma...@gmail.com>
Authored: Fri Oct 28 19:19:59 2016 +0100
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 28 17:12:03 2016 -0700
----------------------------------------------------------------------
geode-assembly/src/main/dist/bin/gfsh.bat | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dbcbd55f/geode-assembly/src/main/dist/bin/gfsh.bat
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat b/geode-assembly/src/main/dist/bin/gfsh.bat
index 8206b6e..a89845c 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -82,5 +82,5 @@ REM Expect to find the tools.jar from the JDK
)
REM Call java with our classpath
-@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath %DEPENDENCIES% %JAVA_ARGS% %LAUNCHER% %*
+@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml -classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %*
:done
[2/2] incubator-geode git commit: Fixing spotless formatting errors.
Posted by up...@apache.org.
Fixing spotless formatting errors.
2ef50b24de1457ab91729f22a3c2ff4a8a07557b introduced spotless formatting
issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/29bb98a2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/29bb98a2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/29bb98a2
Branch: refs/heads/develop
Commit: 29bb98a23e720a84d7e0f22dcd0ae25b418eec27
Parents: dbcbd55
Author: Dan Smith <up...@apache.org>
Authored: Fri Oct 28 17:12:56 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Oct 28 17:12:56 2016 -0700
----------------------------------------------------------------------
.../internal/cache/AbstractRegionEntry.java | 1 +
.../internal/cache/AbstractRegionEntryTest.java | 44 +++++++++-----------
2 files changed, 21 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
index 2138af9..41ca8d0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
@@ -228,6 +228,7 @@ public abstract class AbstractRegionEntry implements RegionEntry, HashEntry<Obje
}
}
}
+
private void basicMakeTombstone(LocalRegion r) throws RegionClearedException {
boolean setValueCompleted = false;
try {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
index 36e3e30..2f372bc 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
@@ -1,18 +1,16 @@
/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
*/
package org.apache.geode.internal.cache;
@@ -31,9 +29,10 @@ import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
public class AbstractRegionEntryTest {
-
+
@Test
- public void whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone() throws RegionClearedException {
+ public void whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone()
+ throws RegionClearedException {
LocalRegion lr = mock(LocalRegion.class);
RegionVersionVector<?> rvv = mock(RegionVersionVector.class);
when(lr.getVersionVector()).thenReturn(rvv);
@@ -42,20 +41,19 @@ public class AbstractRegionEntryTest {
AbstractRegionEntry re = new TestableRegionEntry(lr, value);
assertEquals(value, re.getValueField());
Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
- .isInstanceOf(RuntimeException.class)
- .hasMessage("throw exception on setValue(TOMBSTONE)");
+ .isInstanceOf(RuntimeException.class).hasMessage("throw exception on setValue(TOMBSTONE)");
assertEquals(Token.REMOVED_PHASE2, re.getValueField());
}
-
+
public static class TestableRegionEntry extends AbstractRegionEntry {
private Object value;
-
+
protected TestableRegionEntry(RegionEntryContext context, Object value) {
super(context, value);
}
-
+
@Override
protected Object getValueField() {
return this.value;
@@ -86,8 +84,7 @@ public class AbstractRegionEntryTest {
}
@Override
- public void setNextEntry(HashEntry<Object, Object> n) {
- }
+ public void setNextEntry(HashEntry<Object, Object> n) {}
@Override
public Object getKey() {
@@ -105,8 +102,7 @@ public class AbstractRegionEntryTest {
}
@Override
- protected void setEntryHash(int v) {
- }
-
+ protected void setEntryHash(int v) {}
+
}
}