Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use isNotBlank to avoid warning in log 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1176384 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-09-27 13:55:26 +00:00
parent 066197cdd2
commit afababf393
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-scheduler/archiva-scheduler-indexing/src/main/java/org/apache/archiva/scheduler/indexing/DefaultDownloadRemoteIndexScheduler.java
View File

@ -178,7 +178,7 @@ public class DefaultDownloadRemoteIndexScheduler
return; return;
} }
NetworkProxy networkProxy = null; NetworkProxy networkProxy = null;
if ( remoteRepository.getRemoteDownloadNetworkProxyId() != null ) if ( StringUtils.isNotBlank( remoteRepository.getRemoteDownloadNetworkProxyId() ) )
{ {
networkProxy = networkProxyAdmin.getNetworkProxy( remoteRepository.getRemoteDownloadNetworkProxyId() ); networkProxy = networkProxyAdmin.getNetworkProxy( remoteRepository.getRemoteDownloadNetworkProxyId() );
if ( networkProxy == null ) if ( networkProxy == null )

13
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/jsp/admin/editRemoteRepository.jsp
View File

@ -42,16 +42,25 @@
<s:submit value="Update Repository"/> <s:submit value="Update Repository"/>
</s:form> </s:form>
<redback:ifAuthorized permission="archiva-run-indexer"> <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:hidden name="repoid"/>
<s:checkbox name="now" label="Now" /> <s:checkbox name="now" label="Now" />
<s:checkbox name="fullDownload" label="Full download"/> <s:checkbox name="fullDownload" label="Full download"/>
<s:submit value="download Remote Index"/> <s:submit value="download Remote Index" onclick="javascript:downloadRemote();"/>
</s:form> </s:form>
</redback:ifAuthorized> </redback:ifAuthorized>
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("editRemoteRepository_repository_name").focus(); document.getElementById("editRemoteRepository_repository_name").focus();
function downloadRemote() {
$.ajax({
url: "test.html",
success: function(){
alert("ok");
}
});
}
</script> </script>
</div> </div>