Build: #2748 was successful Changes by Guus der Kinderen
Code commits
Openfire (master)
-
Guus der Kinderen d918634c3231e786c0c3c560af3da0714373b546
OF-3044: When resource binding, ensure that old detached sessions are removed
After resource binding succeeds, clean-up of older, detached sessions will be problematic (as that needs to update state, but typically also sends out presence unavailable on behalf of the user).
In this commit, any detached sessions matching the full JID that will be the result of a successful resource binding is terminated, prior to resource binding being allowed to complete.- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version d918634c3231e786c0c3c560af3da0714373b546)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java (version d918634c3231e786c0c3c560af3da0714373b546)
-
Guus der Kinderen 42940bcf195b6584b1fde1d22c311f35bda71d2b
code cleanup: use isEmpty instead of numeric comparison
Replace `.size()` and `.length()` comparisons with `0` with a call to `.isEmpty()`, which is more descriptive and thus a bit less error prone.- xmppserver/src/main/java/org/dom4j/io/XMPPPacketReader.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/admin/LdapUserProfile.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/admin/LdapUserTester.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/admin/SidebarTag.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/admin/SubnavTag.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/admin/TabsTag.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/database/JNDIDataSourceProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/MessageRouter.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/MulticastRouter.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/OfflineMessageStrategy.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/SessionManager.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/admin/DefaultAdminProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/audit/spi/AuditManagerImpl.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/DefaultAuthorizationMapping.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/auth/POP3AuthProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/component/InternalComponentManager.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/AdminConsolePlugin.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdAdminProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdGroupProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/crowd/CrowdUserProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQBindHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQLastActivityHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQRegisterHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/handler/IQVersionHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapGroupProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/ldap/LdapManager.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/HistoryStrategy.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoom.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/MUCRoomHistory.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/IQMUCSearchHandler.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MUCPersistenceManager.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/MultiUserChatServiceImpl.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/DNSUtil.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketReader.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/DefaultPubSubPersistenceProvider.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/Node.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/NodeSubscription.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/sasl/ExternalClientSaslServer.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/server/OutgoingSessionPromise.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/session/LocalOutgoingServerSession.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionListener.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/ConnectionManagerImpl.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/util/CookieUtils.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/util/ElementUtil.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/util/EmailService.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/util/StringUtils.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/util/XMLProperties.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/java/org/jivesoftware/util/XMLWriter.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/audit-policy.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/connection-managers-settings.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/connection-settings-socket-s2s.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/group-create.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/group-edit.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/login.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/loginToken.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/manage-updates.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-create-permission.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-default-settings.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-history-settings.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-room-delete.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-room-edit-form.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-service-edit-form.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-sysadmins.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/muc-tasks.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/offline-messages.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/profile-settings.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/security-keystore-signing-request.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/security-keystore.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/server-props.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/session-conflict.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/setup/ldap-server.jspf (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/setup/setup-admin-settings.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/setup/setup-datasource-jndi.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/setup/setup-datasource-standard.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/setup/setup-host-settings.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/system-email.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/system-emailtest.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/user-create.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/user-edit-form.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/user-message.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/user-roster-add.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/main/webapp/user-search.jsp (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
- xmppserver/src/test/java/org/jivesoftware/util/AdminConsoleTest.java (version 42940bcf195b6584b1fde1d22c311f35bda71d2b)
-
Guus der Kinderen 0ca48ef52cc9e68a43e8a67a4335bef2c1529732
Replace statement lambda with expression lambda
- xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version 0ca48ef52cc9e68a43e8a67a4335bef2c1529732)
- xmppserver/src/main/java/org/jivesoftware/openfire/muc/spi/FMUCHandler.java (version 0ca48ef52cc9e68a43e8a67a4335bef2c1529732)
- xmppserver/src/main/java/org/jivesoftware/openfire/spi/RoutingTableImpl.java (version 0ca48ef52cc9e68a43e8a67a4335bef2c1529732)
- xmppserver/src/main/webapp/muc-room-clear-chat.jsp (version 0ca48ef52cc9e68a43e8a67a4335bef2c1529732)
- xmppserver/src/test/java/org/jivesoftware/openfire/session/RemoteInitiatingServerDummy.java (version 0ca48ef52cc9e68a43e8a67a4335bef2c1529732)
-
Guus der Kinderen 66fb8ef96fc70fd550d5304ca2516f50faf20dad
Replace anonymous type with lambda
- starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- starter/src/main/java/org/jivesoftware/openfire/starter/JiveClassLoader.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/Channel.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/JMXManager.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/cluster/ClusterManager.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginClassLoader.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginManager.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoInfoHandler.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/disco/IQDiscoItemsHandler.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/filetransfer/proxy/ProxyConnectionManager.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/keystore/CertificateStoreWatcher.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/CachingPubsubPersistenceProvider.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/pubsub/PubSubEngine.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/openfire/roster/RosterManager.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
- xmppserver/src/main/java/org/jivesoftware/util/WebManager.java (version 66fb8ef96fc70fd550d5304ca2516f50faf20dad)
-
Guus der Kinderen dceac3d568191664851a91e419c6b7524572c8d4
Replace lambda with method reference
- xmppserver/src/main/java/org/jivesoftware/openfire/container/PluginMonitor.java (version dceac3d568191664851a91e419c6b7524572c8d4)
- xmppserver/src/main/java/org/jivesoftware/util/WebManager.java (version dceac3d568191664851a91e419c6b7524572c8d4)
- xmppserver/src/main/webapp/muc-room-cache.jsp (version dceac3d568191664851a91e419c6b7524572c8d4)
-
Guus der Kinderen f77621ba0e66b04c6f033b3c120ed3df383ec7ab
Replace anonymous class with shorter lambda alternative
- starter/src/main/java/org/jivesoftware/openfire/launcher/Launcher.java (version f77621ba0e66b04c6f033b3c120ed3df383ec7ab)
- xmppserver/src/main/java/org/jivesoftware/openfire/XMPPServer.java (version f77621ba0e66b04c6f033b3c120ed3df383ec7ab)
- xmppserver/src/main/java/org/jivesoftware/openfire/privacy/PrivacyList.java (version f77621ba0e66b04c6f033b3c120ed3df383ec7ab)