IGNITE-1606 NPE during node stop due to nullified logger in TcpCommunicationSpi

modules/core/src/main/java/org/apache/ignite/internal/processors/resource/GridResourceProcessor.java

@@ -304,8 +304,11 @@ private void cleanup(Object obj, GridResourceIoc.AnnotationSet annSet)
         if (clsDesc.isAnnotated(annSet) == 0)
             return;
 
-        for (GridResourceIoc.ResourceAnnotation ann : annSet.annotations)
-            clsDesc.inject(obj, ann, nullInjector, null, null);
+        for (GridResourceIoc.ResourceAnnotation ann : annSet.annotations) {
+            // We should not nullify loggers for prevention of NPEs at grid workers.
+            if (ann != GridResourceIoc.ResourceAnnotation.LOGGER)
+                clsDesc.inject(obj, ann, nullInjector, null, null);
+        }
     }
 
     /**

modules/core/src/main/java/org/apache/ignite/resources/LoggerResource.java

@@ -35,6 +35,8 @@
  * <li>{@link org.apache.ignite.lifecycle.LifecycleBean}</li>
  * </ul>
  * <p>
+ * <b>WARNING:</b> unlike other injectable resources, logger resources won't be cleaned on node stop!
+ * <p>
  * Here is how injection would typically happen:
  * <pre name="code" class="java">
  * public class MyGridJob implements ComputeJob {

modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridResourceProcessorSelfTest.java

@@ -318,6 +318,63 @@ public void testInjectResourceInnerClasses() throws Exception {
         assertEquals(testStr, outer.str7);
     }
 
+    /** */
+    private static class TestClassWithGenericAnnotationSet {
+        /** */
+        @IgniteInstanceResource
+        private Ignite ignite;
+
+        /** */
+        private Ignite igniteBySetter;
+
+        /** */
+        @LoggerResource
+        private IgniteLogger log;
+
+        /** */
+        private IgniteLogger logBySetter;
+
+        /**
+         * @param ignite Ignite instance.
+         */
+        @IgniteInstanceResource
+        public void setIgniteBySetter(Ignite ignite) {
+            igniteBySetter = ignite;
+        }
+
+        /**
+         * @param log Logger instance.
+         */
+        @LoggerResource
+        public void setLogBySetter(IgniteLogger log) {
+            logBySetter = log;
+        }
+    }
+
+    /**
+     * @throws Exception If failed.
+     */
+    @Test
+    public void testInjectAndCleanupGenericAnnotationSet() throws Exception {
+        TestClassWithGenericAnnotationSet target = new TestClassWithGenericAnnotationSet();
+
+        ctx.resource().injectGeneric(target);
+
+        assertNotNull(target.ignite);
+        assertNotNull(target.igniteBySetter);
+        assertNotNull(target.log);
+        assertNotNull(target.logBySetter);
+
+        ctx.resource().cleanupGeneric(target);
+
+        assertNull(target.ignite);
+        assertNull(target.igniteBySetter);
+
+        // Logger instances shouldn't be cleaned.
+        assertNotNull(target.log);
+        assertNotNull(target.logBySetter);
+    }
+
     /**
      * Test task.
      */