diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java index 75d5b0d654eaf..16ef0b8f39f88 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/collision/GridCollisionManager.java @@ -58,8 +58,10 @@ public GridCollisionManager(GridKernalContext ctx) { } }); } - else - log.info("Collision resolution is disabled (all jobs will be activated upon arrival)."); + else { + if (log.isInfoEnabled()) + log.info("Collision resolution is disabled (all jobs will be activated upon arrival)."); + } if (log.isDebugEnabled()) log.debug(startInfo()); diff --git a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java index 9139710216381..7dd8225561058 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/GridCollisionManagerLoggingSelfTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * Tests for making sure that {@link GridCollisionManager} logs about specific conditions at correct levels, @@ -56,9 +57,17 @@ public void initLoggerMock() { public void collisionResolutionDisabledMessageShouldBeLoggedAtInfoLevel() throws Exception { GridCollisionManager mgr = new GridCollisionManager(collisionResolutionDisabledContext()); - mgr.start(); + boolean infoLevel = logger.isInfoEnabled(); + when(logger.isInfoEnabled()).thenReturn(true); - verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival)."); + try { + mgr.start(); + + verify(logger).info("Collision resolution is disabled (all jobs will be activated upon arrival)."); + } + finally { + when(logger.isInfoEnabled()).thenReturn(infoLevel); + } } /**