[jspwiki] branch master updated: Strings and Boxed types should be compared using "equals()"

[ju...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git


The following commit(s) were added to refs/heads/master by this push:
     new ca88c26  Strings and Boxed types should be compared using "equals()"
ca88c26 is described below

commit ca88c2635936af3f057af80f5e79547a07c37b97
Author: Haris Adzemovic <ad...@gmail.com>
AuthorDate: Tue Nov 5 12:34:43 2019 +0100

    Strings and Boxed types should be compared using "equals()"
    
    This fixes 3 Sonarqube violations of rule S4973:
    https://rules.sonarsource.com/java/RSPEC-4973
    
    Sonarcloud violation URL:
    https://sonarcloud.io/organizations/apache/issues?open=AWyr6XyY5ULuzyOxXLGi&resolved=false&rules=squid%3AS4973
    
    Jira Ticket:
    https://issues.apache.org/jira/browse/JSPWIKI-1120
---
 jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java       | 4 ++--
 jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
index b75e911..eb58b90 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/WikiSession.java
@@ -484,7 +484,7 @@ public final class WikiSession implements WikiEventListener
                     case WikiSecurityEvent.PRINCIPAL_ADD:
                     {
                         WikiSession target = (WikiSession)e.getTarget();
-                        if ( this.equals( target ) && m_status == AUTHENTICATED )
+                        if ( this.equals( target ) && m_status.equals(AUTHENTICATED) )
                         {
                             Set<Principal> principals = m_subject.getPrincipals();
                             principals.add( (Principal)e.getPrincipal());
@@ -569,7 +569,7 @@ public final class WikiSession implements WikiEventListener
                     {
                         // Refresh user principals based on new user profile
                         WikiSession source = e.getSrc();
-                        if ( this.equals( source ) && m_status == AUTHENTICATED )
+                        if ( this.equals( source ) && m_status.equals(AUTHENTICATED) )
                         {
                             // To prepare for refresh, set the new full name as the primary principal
                             UserProfile[] profiles = (UserProfile[])e.getTarget();
diff --git a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
index 10906ba..afc12e3 100644
--- a/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
+++ b/jspwiki-main/src/main/java/org/apache/wiki/plugin/InsertPage.java
@@ -212,7 +212,7 @@ public class InsertPage
 
                 res.append("<div class=\"inserted-page ");
                 if( clazz != null ) res.append( clazz );
-                if( style != DEFAULT_STYLE ) res.append("\" style=\""+style );
+                if( !style.equals(DEFAULT_STYLE) ) res.append("\" style=\""+style );
                 if( showOnce ) res.append("\" data-once=\""+cookieName );
                 res.append("\" >");