anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflicts.

Browse Source
This commit is contained in:
teranisi
2016-10-20 14:27:51 +09:00
parent 90998c447b d664227436
commit 0c5f0f293f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/main/java/io/moquette/spi/impl/ProtocolProcessorBootstrapper.java
+1 -1
View File
@@ -78,7 +78,7 @@ public class ProtocolProcessorBootstrapper {
m_mapStorage = new MapDBPersistentStore(props);
m_mapStorage.initStore();
IMessagesStore messagesStore = m_mapStorage.messagesStore();
ISessionsStore m_sessionsStore = m_mapStorage.sessionsStore();
m_sessionsStore = m_mapStorage.sessionsStore();
List<InterceptHandler> observers = new ArrayList<>(embeddedObservers);
String interceptorClassName = props.getProperty(BrokerConstants.INTERCEPT_HANDLER_PROPERTY_NAME);