java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java | 11
+++++++++-
java/spacewalk-java.spec | 11
+++++++++-
rel-eng/packages/spacewalk-java | 2
-
3 files changed, 21 insertions(+), 3 deletions(-)
New commits:
commit fc0887eeff55ee58f82c042f6bd230fbc5940345
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Jun 27 11:52:52 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.107-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index e7ac0b9..9bfff93 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.106
+Version: 1.10.107
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jun 27 2013 Jan Dobes 1.10.107-1
+- 514223 - catching invalid ip to prevent ISE
+- removing @Override annotation from methods that aren't overriden
+- removing unnecessarily nested else clause
+- removing unnecessarily nested else clause
+- removing unnecessary casts
+- 976136 - we need unentitle channels before we delete them
+- 912931 - move taskomatic bunch logs to /var/log instead of /var/lib
+
* Tue Jun 25 2013 Grant Gainey 1.10.106-1
- Fix checkstyle issues
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index dc7fd08..a6e2068 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.106-1 java/
+1.10.107-1 java/
commit 08ff97d391498d54c87b370158e647f794e1623f
Author: Jan Dobes <jdobes(a)redhat.com>
Date: Thu Jun 27 11:34:23 2013 +0200
514223 - catching invalid ip to prevent ISE
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
index 9747f75..1987531 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartIpRangeFilter.java
@@ -17,6 +17,7 @@ package com.redhat.rhn.frontend.action.kickstart;
import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.frontend.dto.kickstart.KickstartIpRangeDto;
import com.redhat.rhn.frontend.taglibs.list.BaseListFilter;
+import com.redhat.rhn.frontend.xmlrpc.InvalidIpAddressException;
import com.redhat.rhn.manager.kickstart.IpAddress;
import com.redhat.rhn.manager.kickstart.IpAddressRange;
@@ -51,7 +52,15 @@ public class KickstartIpRangeFilter extends BaseListFilter {
IpAddress min = new IpAddress(range.getMin());
IpAddress max = new IpAddress(range.getMax());
- return filterOnRange(criteria, min.toString(), max.toString());
+ boolean contained;
+ try {
+ contained = filterOnRange(criteria, min.toString(), max.toString());
+ }
+ catch (InvalidIpAddressException e) {
+ contained = false;
+ }
+
+ return contained;
}