You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/08/10 17:08:58 UTC
svn commit: r1695108 - in /qpid/java/trunk/broker-core/src:
main/java/org/apache/qpid/server/logging/
test/java/org/apache/qpid/server/logging/
Author: orudyy
Date: Mon Aug 10 15:08:58 2015
New Revision: 1695108
URL: http://svn.apache.org/r1695108
Log:
QPID-6686: Fix NPE thrown when accessing FileLogger#logFiles when FileLogger is in ERRORED state due to attribute value resolution errors
Added:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java?rev=1695108&r1=1695107&r2=1695108&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java Mon Aug 10 15:08:58 2015
@@ -24,6 +24,7 @@ import java.io.File;
import java.io.IOError;
import java.io.IOException;
import java.security.AccessControlException;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -151,7 +152,7 @@ public class BrokerFileLoggerImpl extend
@Override
public List<LogFileDetails> getLogFiles()
{
- return _rolloverWatcher.getLogFileDetails();
+ return _rolloverWatcher == null ? Collections.<LogFileDetails>emptyList() :_rolloverWatcher.getLogFileDetails();
}
@Override
@@ -162,7 +163,7 @@ public class BrokerFileLoggerImpl extend
throw new AccessControlException("Permission denied to access log content");
}
- return _rolloverWatcher.getFileContent(fileName);
+ return _rolloverWatcher == null ? null : _rolloverWatcher.getFileContent(fileName);
}
@Override
@@ -173,7 +174,7 @@ public class BrokerFileLoggerImpl extend
throw new AccessControlException("Permission denied to access log content");
}
- return _rolloverWatcher.getFilesAsZippedContent(fileName);
+ return _rolloverWatcher == null ? null :_rolloverWatcher.getFilesAsZippedContent(fileName);
}
@Override
@@ -184,7 +185,7 @@ public class BrokerFileLoggerImpl extend
throw new AccessControlException("Permission denied to access log content");
}
- return _rolloverWatcher.getAllFilesAsZippedContent();
+ return _rolloverWatcher == null ? null : _rolloverWatcher.getAllFilesAsZippedContent();
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java?rev=1695108&r1=1695107&r2=1695108&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java Mon Aug 10 15:08:58 2015
@@ -21,7 +21,6 @@
package org.apache.qpid.server.logging;
-import java.util.Collection;
import java.util.List;
import java.util.Set;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java?rev=1695108&r1=1695107&r2=1695108&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java Mon Aug 10 15:08:58 2015
@@ -22,6 +22,7 @@ package org.apache.qpid.server.logging;
import java.io.File;
import java.security.AccessControlException;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -140,7 +141,7 @@ public class VirtualHostFileLoggerImpl e
@Override
public List<LogFileDetails> getLogFiles()
{
- return _rolloverWatcher.getLogFileDetails();
+ return _rolloverWatcher == null ? Collections.<LogFileDetails>emptyList() : _rolloverWatcher.getLogFileDetails();
}
@Override
@@ -151,7 +152,7 @@ public class VirtualHostFileLoggerImpl e
throw new AccessControlException("Permission denied to access log content");
}
- return _rolloverWatcher.getFileContent(fileName);
+ return _rolloverWatcher == null ? null : _rolloverWatcher.getFileContent(fileName);
}
@Override
@@ -162,7 +163,7 @@ public class VirtualHostFileLoggerImpl e
throw new AccessControlException("Permission denied to access log content");
}
- return _rolloverWatcher.getFilesAsZippedContent(fileName);
+ return _rolloverWatcher == null ? null : _rolloverWatcher.getFilesAsZippedContent(fileName);
}
@@ -174,7 +175,7 @@ public class VirtualHostFileLoggerImpl e
throw new AccessControlException("Permission denied to access log content");
}
- return _rolloverWatcher.getAllFilesAsZippedContent();
+ return _rolloverWatcher == null ? null : _rolloverWatcher.getAllFilesAsZippedContent();
}
@Override
Added: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java?rev=1695108&view=auto
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java (added)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerFileLoggerTest.java Mon Aug 10 15:08:58 2015
@@ -0,0 +1,120 @@
+/*
+ *
+ * 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
+ *
+ * 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.qpid.server.logging;
+
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.qpid.server.configuration.updater.TaskExecutor;
+import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.BrokerLogger;
+import org.apache.qpid.server.model.BrokerModel;
+import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.model.State;
+import org.apache.qpid.server.model.SystemConfig;
+import org.apache.qpid.server.security.SecurityManager;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.util.FileUtils;
+
+public class BrokerFileLoggerTest extends QpidTestCase
+{
+ private TaskExecutor _taskExecutor;
+ private File _baseFolder;
+ private File _logFile;
+ private Broker _broker;
+
+ @Override
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ _taskExecutor = new TaskExecutorImpl();
+ _taskExecutor.start();
+
+ Model model = BrokerModel.getInstance();
+
+ org.apache.qpid.server.security.SecurityManager securityManager = mock(SecurityManager.class);
+ EventLogger eventLogger = mock(EventLogger.class);
+
+ SystemConfig<?> systemConfig = mock(SystemConfig.class);
+ when(systemConfig.getModel()).thenReturn(model);
+ when(systemConfig.getChildExecutor()).thenReturn(_taskExecutor);
+ when(systemConfig.getEventLogger()).thenReturn(eventLogger);
+ doReturn(SystemConfig.class).when(systemConfig).getCategoryClass();
+
+ _broker = mock(Broker.class);
+ when(_broker.getSecurityManager()).thenReturn(securityManager);
+ when(_broker.getModel()).thenReturn(model);
+ when(_broker.getChildExecutor()).thenReturn(_taskExecutor);
+ when(_broker.getParent(SystemConfig.class)).thenReturn(systemConfig);
+ doReturn(Broker.class).when(_broker).getCategoryClass();
+
+ _baseFolder = new File(TMP_FOLDER, "test-sub-folder");
+ _logFile = new File(_baseFolder, "tmp-broker-host.log." + System.currentTimeMillis());
+ if (_baseFolder.exists())
+ {
+ FileUtils.delete(_baseFolder, true);
+ }
+ }
+
+ @Override
+ public void tearDown() throws Exception
+ {
+ try
+ {
+ _broker.close();
+ _taskExecutor.stopImmediately();
+ if (_baseFolder != null && _baseFolder.exists())
+ {
+ FileUtils.delete(_baseFolder, true);
+ }
+ }
+ finally
+ {
+ super.tearDown();
+ }
+ }
+
+ public void testGetLogFilesOnResolutionErrors()
+ {
+ Map<String, Object> attributes = new HashMap<>();
+ attributes.put(BrokerLogger.NAME, getTestName());
+ attributes.put(ConfiguredObject.TYPE, BrokerFileLogger.TYPE);
+ attributes.put(BrokerFileLogger.FILE_NAME, _logFile.getPath());
+ attributes.put(BrokerFileLogger.MAX_FILE_SIZE, "invalid");
+
+ BrokerFileLogger logger = new BrokerFileLoggerImpl(attributes, _broker);
+ logger.open();
+
+ assertEquals("Unexpected state", State.ERRORED, logger.getState());
+
+ Collection<LogFileDetails> logFileDetails = logger.getLogFiles();
+ assertTrue("File details should be empty", logFileDetails.isEmpty());
+ }
+
+}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java?rev=1695108&r1=1695107&r2=1695108&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/VirtualHostLoggerTest.java Mon Aug 10 15:08:58 2015
@@ -203,6 +203,23 @@ public class VirtualHostLoggerTest exte
}
}
+ public void testGetLogFilesOnResolutionErrors()
+ {
+ Map<String, Object> attributes = new HashMap<>();
+ attributes.put(VirtualHostLogger.NAME, getTestName());
+ attributes.put(ConfiguredObject.TYPE, VirtualHostFileLogger.TYPE);
+ attributes.put(VirtualHostFileLogger.FILE_NAME, _logFile.getPath());
+ attributes.put(VirtualHostFileLogger.MAX_FILE_SIZE, "invalid");
+
+ VirtualHostFileLogger logger = new VirtualHostFileLoggerImpl(attributes, _virtualHost);
+ logger.open();
+
+ assertEquals("Unexpected state", State.ERRORED, logger.getState());
+
+ Collection<LogFileDetails> logFileDetails = logger.getLogFiles();
+ assertTrue("File details should be empty", logFileDetails.isEmpty());
+ }
+
private VirtualHostLogger createVirtualHostLogger()
{
return createVirtualHostLogger(Collections.<String,Object>emptyMap());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org