release version 1.6.0

igniterealtime · Jan 20, 2022 · 8efa17d · 8efa17d
1 parent ad68a07
commit 8efa17d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/changelog.html b/changelog.html
@@ -44,13 +44,21 @@ <h1>
 Pade Changelog
 </h1>
 
-<p><b>1.6.0</b> -- <i>January ??, 2022</i></p>
+<p><b>1.6.0</b> -- <i>January 20, 2022</i></p>
  <ul>
-     <li>Upgrade to latest Openfire 4.7.0. Set min Opefire version to 4.7.0-beta and build with version 4.7.0-beta</li>    
+     <li>Move Jitsi logging to debug</li>  
+     <li>Upgrade to latest Openfire 4.7.0. Set min Opefire version to 4.7.0 and build with version 4.7.0</li>    
      <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/376">Issue #376 - Add support for clustering using Hazelcast plugin</a></li> 	
      <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/381">Issue #381 - Rename the package for the PushInterceptor</a></li> 
+     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/383">Issue #383 - Fix NPE with Bookmark packet interceptor</a></li>  	 
  </ul>
 
+<p><b>1.5.4</b> -- <i>Januray 20, 2022</i></p>
+ <ul>	
+     <li>Move Jitsi logging to debug</li>  
+     <li>Fixed <a href="https://github.com/igniterealtime/openfire-pade-plugin/issues/383">Issue #383 - Fix NPE with Bookmark packet interceptor</a></li> 
+ </ul>
+
 <p><b>1.5.3</b> -- <i>Januray 13, 2022</i></p>
  <ul>
      <li>Upgrade to latest Openfire 4.6.4. Set min Opefire version to 4.6.4 and build with version 4.6.4</li>   

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>org.igniterealtime.openfire</groupId>
     <artifactId>pade</artifactId>
-    <version>1.6.0-SNAPSHOT</version>	
+    <version>1.6.0</version>	
 
     <name>Pade</name>
     <description>Web-based chat, groupchat, telephones, audio and video conferencing solution using ConverseJS, Jitsi and FreeSWITCH</description>

diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/BookmarkInterceptor.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/BookmarkInterceptor.java
@@ -59,6 +59,11 @@ public void interceptPacket( Packet packet,
             return;
         }
 
+        if ( packet == null || session == null )
+        {
+            return;
+        }
+
         // Only interested in stanzas that are either:
         // - from the server itself.
         // - sent 'on behalf of' the user that is the recipient of the stanza ('from' matches session address).

diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJicofoWrapper.java
@@ -198,12 +198,12 @@ public synchronized void destroy() throws Exception
 
     public void onOutputLine(final String line)
     {
-        Log.info("onOutputLine " + line);
+        Log.debug("onOutputLine " + line);
     }
 
     public void onProcessQuit(int code)
     {
-        Log.info("onProcessQuit " + code);
+        Log.debug("onProcessQuit " + code);
         System.setProperty("ofmeet.jicofo.started", "false");
     }
 
@@ -213,7 +213,7 @@ public void onOutputClosed() {
 
     public void onErrorLine(final String line)
     {
-        Log.info(line);
+        Log.debug(line);
         if (line.contains("Added new videobridge:")) System.setProperty("ofmeet.jicofo.started", "true");
     }
 

diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJigasiWrapper.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJigasiWrapper.java
@@ -216,12 +216,12 @@ public synchronized void destroy() throws Exception
 
     public void onOutputLine(final String line)
     {
-        Log.info("onOutputLine " + line);
+        Log.debug("onOutputLine " + line);
     }
 
     public void onProcessQuit(int code)
     {
-        Log.info("onProcessQuit " + code);
+        Log.debug("onProcessQuit " + code);
         System.setProperty("ofmeet.jigasi.started", "false");
     }
 
@@ -231,7 +231,7 @@ public void onOutputClosed() {
 
     public void onErrorLine(final String line)
     {
-        Log.info(line);
+        Log.debug(line);
         if (line.contains("newState=RegistrationState=Registered")) System.setProperty("ofmeet.jigasi.started", "true");
     }
 

diff --git a/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJvbWrapper.java b/src/java/org/jivesoftware/openfire/plugin/ofmeet/JitsiJvbWrapper.java
@@ -429,12 +429,12 @@ public synchronized void destroy() throws Exception
 
     public void onOutputLine(final String line)
     {
-        Log.info("onOutputLine " + line);
+        Log.debug("onOutputLine " + line);
     }
 
     public void onProcessQuit(int code)
     {
-        Log.info("onProcessQuit " + code);
+        Log.debug("onProcessQuit " + code);
         System.setProperty("ofmeet.jvb.started", "false");
     }
 
@@ -444,7 +444,7 @@ public void onOutputClosed() {
 
     public void onErrorLine(final String line)
     {
-        Log.info(line);
+        Log.debug(line);
 
         if (line.contains("Server.doStart: Started"))
         {