Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 666B518B20 for ; Wed, 4 Nov 2015 14:27:42 +0000 (UTC) Received: (qmail 93540 invoked by uid 500); 4 Nov 2015 14:27:42 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 93458 invoked by uid 500); 4 Nov 2015 14:27:42 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 93435 invoked by uid 99); 4 Nov 2015 14:27:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Nov 2015 14:27:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 02DD7DFD7B; Wed, 4 Nov 2015 14:27:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dmagda@apache.org To: commits@ignite.apache.org Date: Wed, 04 Nov 2015 14:27:41 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [01/37] ignite git commit: testUseDefaultSuid fixed Repository: ignite Updated Branches: refs/heads/ignite-1790 5fa3420ca -> a1d4e0357 testUseDefaultSuid fixed Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c39b6d43 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c39b6d43 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c39b6d43 Branch: refs/heads/ignite-1790 Commit: c39b6d43d61c9aab3dcd3240537a487c2e4605ad Parents: 7f0b3fc Author: agura Authored: Wed Oct 28 15:57:10 2015 +0300 Committer: agura Committed: Wed Oct 28 15:57:10 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/IgniteKernal.java | 69 ++++++++++---------- .../GridDiscoveryManagerAttributesSelfTest.java | 23 ++++--- 2 files changed, 50 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c39b6d43/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 0865119..4820a93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -17,6 +17,38 @@ package org.apache.ignite.internal; +import java.io.Externalizable; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InvalidObjectException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.io.ObjectStreamException; +import java.io.Serializable; +import java.lang.management.ManagementFactory; +import java.lang.management.RuntimeMXBean; +import java.lang.ref.WeakReference; +import java.lang.reflect.Constructor; +import java.text.DateFormat; +import java.text.DecimalFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Properties; +import java.util.Timer; +import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicReference; +import javax.management.JMException; +import javax.management.ObjectName; import org.apache.ignite.IgniteAtomicLong; import org.apache.ignite.IgniteAtomicReference; import org.apache.ignite.IgniteAtomicSequence; @@ -135,42 +167,10 @@ import org.apache.ignite.spi.IgniteSpi; import org.apache.ignite.spi.IgniteSpiVersionCheckException; import org.jetbrains.annotations.Nullable; -import javax.management.JMException; -import javax.management.ObjectName; -import java.io.Externalizable; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InvalidObjectException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.io.ObjectStreamException; -import java.io.Serializable; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; -import java.lang.ref.WeakReference; -import java.lang.reflect.Constructor; -import java.text.DateFormat; -import java.text.DecimalFormat; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.ListIterator; -import java.util.Map; -import java.util.Properties; -import java.util.Timer; -import java.util.UUID; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicReference; - import static org.apache.ignite.IgniteSystemProperties.IGNITE_CONFIG_URL; import static org.apache.ignite.IgniteSystemProperties.IGNITE_DAEMON; import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SKIP_CONFIGURATION_CONSISTENCY_CHECK; import static org.apache.ignite.IgniteSystemProperties.IGNITE_STARVATION_CHECK_INTERVAL; import static org.apache.ignite.IgniteSystemProperties.IGNITE_SUCCESS_FILE; @@ -1268,7 +1268,8 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { add(ATTR_BUILD_VER, VER_STR); add(ATTR_BUILD_DATE, BUILD_TSTAMP_STR); add(ATTR_MARSHALLER, cfg.getMarshaller().getClass().getName()); - add(ATTR_MARSHALLER_USE_DFLT_SUID, OptimizedMarshaller.USE_DFLT_SUID); + add(ATTR_MARSHALLER_USE_DFLT_SUID, + getBoolean(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, OptimizedMarshaller.USE_DFLT_SUID)); add(ATTR_USER_NAME, System.getProperty("user.name")); add(ATTR_GRID_NAME, gridName); http://git-wip-us.apache.org/repos/asf/ignite/blob/c39b6d43/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java index 6e2c635..3a2f3ba 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java @@ -25,9 +25,9 @@ import org.apache.ignite.marshaller.optimized.OptimizedMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; -import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import static org.apache.ignite.IgniteSystemProperties.IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID; import static org.apache.ignite.configuration.DeploymentMode.CONTINUOUS; import static org.apache.ignite.configuration.DeploymentMode.SHARED; @@ -121,22 +121,29 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA * @throws Exception If failed. */ public void testUseDefaultSuid() throws Exception { - doTestUseDefaultSuid(true, false, true); - doTestUseDefaultSuid(false, true, true); - doTestUseDefaultSuid(true, true, false); - doTestUseDefaultSuid(false, false, false); + try { + doTestUseDefaultSuid(Boolean.TRUE.toString(), Boolean.FALSE.toString(), true); + doTestUseDefaultSuid(Boolean.FALSE.toString(), Boolean.TRUE.toString(), true); + + doTestUseDefaultSuid(Boolean.TRUE.toString(), Boolean.TRUE.toString(), false); + doTestUseDefaultSuid(Boolean.FALSE.toString(), Boolean.FALSE.toString(), false); + } + finally { + System.setProperty(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, + String.valueOf(OptimizedMarshaller.USE_DFLT_SUID)); + } } /** * @throws Exception If failed. */ - private void doTestUseDefaultSuid(Boolean first, Boolean second, boolean fail) throws Exception { + private void doTestUseDefaultSuid(String first, String second, boolean fail) throws Exception { try { - GridTestUtils.setFieldValue(null, OptimizedMarshaller.class, "USE_DFLT_SUID", first); + System.setProperty(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, first); startGrid(0); - GridTestUtils.setFieldValue(null, OptimizedMarshaller.class, "USE_DFLT_SUID", second); + System.setProperty(IGNITE_OPTIMIZED_MARSHALLER_USE_DEFAULT_SUID, second); try { startGrid(1);