You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2011/10/04 16:58:08 UTC

svn commit: r1178822 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java

Author: olamy
Date: Tue Oct  4 14:58:08 2011
New Revision: 1178822

URL: http://svn.apache.org/viewvc?rev=1178822&view=rev
Log:
missed to fix add

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java?rev=1178822&r1=1178821&r2=1178822&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/action/admin/connectors/proxy/AddProxyConnectorAction.java Tue Oct  4 14:58:08 2011
@@ -46,13 +46,6 @@ public class AddProxyConnectorAction
     @Override
     public String input()
     {
-        if ( connector != null )
-        {
-            // MRM-1135
-            connector.setBlackListPatterns( escapePatterns( connector.getBlackListPatterns() ) );
-            connector.setWhiteListPatterns( escapePatterns( connector.getWhiteListPatterns() ) );
-        }
-
         return INPUT;
     }
 
@@ -88,10 +81,6 @@ public class AddProxyConnectorAction
             connector.setProxyId( null );
         }
 
-        // MRM-1135
-        connector.setBlackListPatterns( unescapePatterns( connector.getBlackListPatterns() ) );
-        connector.setWhiteListPatterns( unescapePatterns( connector.getWhiteListPatterns() ) );
-
         addProxyConnector( connector );
         return SUCCESS;
     }