svn commit: r1786507 - in /commons/proper/net/trunk/src: changes/changes.xml main/java/org/apache/commons/net/util/SubnetUtils.java

[sebb]

Author: sebb
Date: Sat Mar 11 12:55:16 2017
New Revision: 1786507

URL: http://svn.apache.org/viewvc?rev=1786507&view=rev
Log:
NET-624 SubnetInfo#getCidrSignature - improve functions

Modified:
    commons/proper/net/trunk/src/changes/changes.xml
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java

Modified: commons/proper/net/trunk/src/changes/changes.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/changes/changes.xml?rev=1786507&r1=1786506&r2=1786507&view=diff
==============================================================================
--- commons/proper/net/trunk/src/changes/changes.xml [utf-8] (original)
+++ commons/proper/net/trunk/src/changes/changes.xml [utf-8] Sat Mar 11 
12:55:16 2017
@@ -71,16 +71,19 @@ This is mainly a bug-fix release. See fu
  However it is not source compatible with releases before 3.4, as some methods 
were added to the interface NtpV3Packet in 3.4
         
 ">
+            <action issue="NET-624" type="update" dev="sebb" due-to="Makoto 
Sakaguchi">
+            SubnetInfo#getCidrSignature - improve functions
+            </action>
             <action issue="NET-624" type="fix" dev="sebb" due-to="Makoto 
Sakaguchi">
             SubnetInfo#toCidrNotation: A wrong format subnet mask is allowed
             </action>
             <action issue="NET-623" type="fix" dev="sebb" due-to="Makoto 
Sakaguchi">
             SubnetUtils - fixed spelling errors
             </action>
-            <action issue="NET-621" type="fix" dev="sebb" due-to="Makoto 
Sakaguchi">
+            <action issue="NET-621" type="update" dev="sebb" due-to="Makoto 
Sakaguchi">
             SubnetUtils#SubnetInfo - remove unnecessary accessors
             </action>
-            <action issue="NET-619" type="fix" dev="sebb" due-to="Makoto 
Sakaguchi">
+            <action issue="NET-619" type="update" dev="sebb" due-to="Makoto 
Sakaguchi">
             SubnetUtils - improve binary netmask algorithm
             </action>
             <action issue="NET-613" type="fix" dev="sebb" due-to="Donald 
Kwakkel">

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java?rev=1786507&r1=1786506&r2=1786507&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/util/SubnetUtils.java
 Sat Mar 11 12:55:16 2017
@@ -204,10 +204,7 @@ public class SubnetUtils {
         }
 
         public String getCidrSignature() {
-            return toCidrNotation(
-                    format(toArray(address)),
-                    format(toArray(netmask))
-            );
+            return format(toArray(address)) + "/" + pop(netmask);
         }
 
         public String[] getAllAddresses() {