rel-eng/packages/spacewalk-search
| 2 +-
search-server/.classpath
| 2 +-
search-server/spacewalk-search/spacewalk-search.spec
| 6 +++++-
search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
| 9 ++++++++-
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 265222c93f65891d6bc07c41decfdbf6c3aa34cb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 18 18:41:43 2011 +0100
Automatic commit of package [spacewalk-search] release [1.3.6-1].
diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search
index 413a7b1..9fc1ee9 100644
--- a/rel-eng/packages/spacewalk-search
+++ b/rel-eng/packages/spacewalk-search
@@ -1 +1 @@
-1.3.5-1 search-server/spacewalk-search/
+1.3.6-1 search-server/spacewalk-search/
diff --git a/search-server/spacewalk-search/spacewalk-search.spec
b/search-server/spacewalk-search/spacewalk-search.spec
index 18357ca..04d8f8e 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -4,7 +4,7 @@ Name: spacewalk-search
Summary: Spacewalk Full Text Search Server
Group: Applications/Internet
License: GPLv2
-Version: 1.3.5
+Version: 1.3.6
Release: 1%{?dist}
# This src.rpm is cannonical upstream
# You can obtain it using this set of commands
@@ -122,6 +122,10 @@ fi
%{_sysconfdir}/logrotate.d/rhn-search
%changelog
+* Tue Jan 18 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.6-1
+- no traceback, when searching on a server with no packages or errata
+ (tlestach(a)redhat.com)
+
* Wed Jan 12 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.5-1
- replace jakarta-commons-logging with apache-commons-logging on F14
(tlestach(a)redhat.com)
commit ab0dc63e953e34ab95854705309d541c5a988b15
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 18 18:39:29 2011 +0100
no traceback, when searching on a server with no packages or errata
diff --git
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
index ce80df2..58609f5 100644
---
a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
+++
b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java
@@ -186,7 +186,14 @@ public class IndexManager {
}
}
catch (IOException e) {
- throw new IndexingException(e);
+ // this exception is thrown, when there're no packages or errata on the
system
+ // and the user performs a search
+ // if this is the case, just return 0 results, otherwise rethrow the
exception
+ if (!e.getMessage().contains("no segments* file found in
org.apache.lucene.store.FSDirectory@/usr/share/rhn/search/indexes")) {
+ throw new IndexingException(e);
+ }
+ log.error(e.getMessage());
+ retval = new ArrayList<Result>();
}
catch (ParseException e) {
throw new QueryParseException("Could not parse query: '" +
query + "'");
commit 84a2809328f16499b28d30a0b463f5983a529867
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jan 18 11:53:05 2011 +0100
changing quartz version in search-server classpath
diff --git a/search-server/.classpath b/search-server/.classpath
index cc3645e..0cfff62 100644
--- a/search-server/.classpath
+++ b/search-server/.classpath
@@ -13,7 +13,7 @@
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/ibatis-2.3.0.677.jar"
sourcepath="libsrc/ibatis-2.3.0.677-src.zip"/>
<classpathentry kind="lib" path="lib/ojdbc14-1.10.jar"/>
- <classpathentry kind="lib" path="lib/quartz-1.5.1.jar"
sourcepath="libsrc/quartz-1.5.1-src.jar"/>
+ <classpathentry kind="lib" path="lib/quartz-1.8.1.jar"
sourcepath="libsrc/quartz-1.5.1-src.jar"/>
<classpathentry kind="lib" path="lib/picocontainer-1.3.jar"/>
<classpathentry kind="lib" path="lib/tanukiwrapper-3.1.2.jar"
sourcepath="libsrc/tanukiwrapper-3.1.2-src.jar"/>
<classpathentry kind="lib" path="lib/log4j-1.2.8.jar"
sourcepath="libsrc/log4j-1.2.8-src.jar"/>
Show replies by date