Fixes #210 and #208

changelog.html

@@ -46,13 +46,16 @@ <h1>
 
 <p><b>2.2.2</b> -- (tbd)</p>
 <ul>
+    <li>Requires Openfire 4.7.0</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/125'>Issue #125</a>] - Combining keyword and date range makes search fail</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/163'>Issue #163</a>] - Migrate Jive Globals to System Properties</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/190'>Issue #190</a>] - Allow code-update to force a reindexation</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/192'>Issue #192</a>] - Combining keyword and participant(s) makes search fail</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/195'>Issue #195</a>] - Class incompatibility with latest OF MUC</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/200'>Issue #200</a>] - Remove references to deprecated logger methods</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/206'>Issue #206</a>] - Fixed auto-updates for 'Conversations' admin page</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/208'>Issue #208</a>] - Prevent NullPointerException when retrieving logs for empty room</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/210'>Issue #210</a>] - Update Jersey library to 2.35</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/213'>Issue #213</a>] - Update iText library to 7.1.17</li>
 </ul>
 
@@ -63,7 +66,7 @@ <h1>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/160'>Issue #160</a>] - Update JRobin</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/165'>Issue #165</a>] - Fix ordering of MAM results</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/167'>Issue #167</a>] - Deal with empty stanzas in db when processing MAM queries</li>
-    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/174'>Issue #174</a>] - Upgrade jackson libraryto 2.12.1</li>
+    <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/174'>Issue #174</a>] - Upgrade jackson library to 2.12.1</li>
     <li>[<a href='https://github.com/igniterealtime/openfire-monitoring-plugin/issues/175'>Issue #175</a>] - Fix database installation script for MySQL (bug introduced in 2.2.0 that affected new installations)</li>
 </ul>
 

classes/WEB-INF/web.xml

@@ -5,13 +5,16 @@
          version="3.1">
 
     <servlet>
-        <servlet-name>JerseyWrapper</servlet-name>
-        <servlet-class>org.jivesoftware.openfire.plugin.JerseyWrapperPublic</servlet-class>
+        <servlet-name>JerseyApplicationPublic</servlet-name>
+        <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+        <init-param>
+            <param-name>javax.ws.rs.Application</param-name>
+            <param-value>org.jivesoftware.openfire.plugin.JerseyApplicationPublic</param-value>
+        </init-param>
     </servlet>
 
-
     <servlet-mapping>
-        <servlet-name>JerseyWrapper</servlet-name>
+        <servlet-name>JerseyApplicationPublic</servlet-name>
         <url-pattern>/api/*</url-pattern>
     </servlet-mapping>
 </web-app>

pom.xml

@@ -14,8 +14,7 @@
 
     <properties>
         <jackson.version>2.12.1</jackson.version>
-        <!-- Consider moving to the org.glassfish.jersey set of artefacts -->
-        <jersey.version>1.19.4</jersey.version>
+        <jersey.version>2.35</jersey.version>
     </properties>
 
     <build>
@@ -34,29 +33,24 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-servlet</artifactId>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-jetty-http</artifactId>
             <version>${jersey.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-bundle</artifactId>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-jetty-servlet</artifactId>
             <version>${jersey.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-            <version>${jackson.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson.version}</version>
+            <groupId>org.glassfish.jersey.inject</groupId>
+            <artifactId>jersey-hk2</artifactId>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jettison</groupId>
-            <artifactId>jettison</artifactId>
-            <version>1.4.0</version>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+            <version>${jersey.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jrobin</groupId>
@@ -89,11 +83,6 @@
             <artifactId>orsonpdf</artifactId>
             <version>1.9</version>
         </dependency>
-        <dependency>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-            <version>1.0</version>
-        </dependency>
 
         <!-- For java 9+, see: https://stackoverflow.com/questions/51916221 -->
         <!-- https://mvnrepository.com/artifact/javax.xml.bind/jaxb-api -->

src/java/com/reucon/openfire/plugin/archive/impl/MucMamPersistenceManager.java

@@ -399,7 +399,13 @@ public static Instant getDateOfFirstLog( MUCRoom room )
             }
             rs = pstmt.executeQuery();
             if (rs.next()) {
-                return new Date(Long.parseLong(rs.getString(1).trim())).toInstant();
+                // Note that 'min()' will return a single 'null' value if the 'where' condition does not match.
+                final String minValue = rs.getString(1);
+                if (minValue == null || rs.wasNull()) {
+                    return null;
+                } else {
+                    return new Date(Long.parseLong(minValue.trim())).toInstant();
+                }
             }
         } catch (SQLException e) {
             Log.error("SQL failure while trying to find the timestamp of the earliest message for room {} in MAM-MUC: ", room.getJID(), e);

src/java/org/jivesoftware/openfire/archive/ArchiveSearcher.java

@@ -459,7 +459,7 @@ private Conversation getNextElement() {
                     while (convIterator.hasNext()) {
                         try {
                             long conversationID = convIterator.next();
-                            return new Conversation(conversationManager, conversationID);
+                            return ConversationDAO.loadConversation(conversationID);
                         }
                         catch (Exception e) {
                             Log.error(e.getMessage(), e);
@@ -546,7 +546,7 @@ private Conversation getNextElement() {
                         try {
                             ScoreDoc hit = hitsIterator.next();
                             long conversationID = Long.parseLong(searcher.doc(hit.doc).get("conversationID"));
-                            return new Conversation(conversationManager, conversationID);
+                            return ConversationDAO.loadConversation(conversationID);
                         }
                         catch (Exception e) {
                             Log.error(e.getMessage(), e);