From afababf393a5e47c541ded81e76b6707a9bf1775 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Tue, 27 Sep 2011 13:55:26 +0000
Subject: [PATCH] use isNotBlank to avoid warning in log

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1176384 13f79535-47bb-0310-9956-ffa450edef68
---
 .../DefaultDownloadRemoteIndexScheduler.java        |  2 +-
 .../WEB-INF/jsp/admin/editRemoteRepository.jsp      | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
index 8c05d5788..a2cb8cf8a 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
@@ -178,7 +178,7 @@ public class DefaultDownloadRemoteIndexScheduler
                 return;
             }
             NetworkProxy networkProxy = null;
-            if ( remoteRepository.getRemoteDownloadNetworkProxyId() != null )
+            if ( StringUtils.isNotBlank( remoteRepository.getRemoteDownloadNetworkProxyId() ) )
             {
                 networkProxy = networkProxyAdmin.getNetworkProxy( remoteRepository.getRemoteDownloadNetworkProxyId() );
                 if ( networkProxy == null )
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
index 6ec8220ba..e946446ff 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
@@ -42,16 +42,25 @@
     <s:submit value="Update Repository"/>
   </s:form>
   <redback:ifAuthorized permission="archiva-run-indexer">
-    <s:form method="post" action="editRemoteRepository!downloadRemoteIndex" namespace="/admin" validate="false">
+    <s:form method="post" action="editRemoteRepository!downloadRemoteIndex" namespace="/admin" validate="false"
+            onsubmit="javascript:downloadRemote();">
       <s:hidden name="repoid"/>
       <s:checkbox name="now" label="Now" />
       <s:checkbox name="fullDownload" label="Full download"/>
-      <s:submit value="download Remote Index"/>
+      <s:submit value="download Remote Index" onclick="javascript:downloadRemote();"/>
     </s:form>
   </redback:ifAuthorized>
 
   <script type="text/javascript">
     document.getElementById("editRemoteRepository_repository_name").focus();
+    function downloadRemote() {
+        $.ajax({
+          url: "test.html",
+          success: function(){
+            alert("ok");
+          }
+        });
+    }
   </script>
 
 </div>