[rocketmq] branch develop updated: [ISSUE #359]Fix logging check period (#360)

[vo...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vongosling pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git


The following commit(s) were added to refs/heads/develop by this push:
     new 76233ed  [ISSUE #359]Fix logging check period (#360)
76233ed is described below

commit 76233ed8b77c293e669f42daec855cabf74b9f3a
Author: what-a-good-jungle <35...@qq.com>
AuthorDate: Mon Jul 16 16:59:29 2018 +0800

    [ISSUE #359]Fix logging check period (#360)
---
 .../src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
index 469cb52..f457a69 100644
--- a/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
+++ b/logging/src/main/java/org/apache/rocketmq/logging/inner/LoggingBuilder.java
@@ -966,7 +966,7 @@ public class LoggingBuilder {
                     rollingCalendar.setType(i);
                     Date next = new Date(rollingCalendar.getNextCheckMillis(epoch));
                     String r1 = simpleDateFormat.format(next);
-                    if (r0.equals(r1)) {
+                    if (r0 != null && r1 != null && !r0.equals(r1)) {
                         return i;
                     }
                 }