java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
| 8 ++++----
java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
| 2 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
| 2 +-
java/code/src/com/redhat/rhn/manager/system/SystemManager.java
| 3 +++
java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java
| 4 +++-
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/050-rhnServerPackage_data.sql
| 2 --
6 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit c122bd485b19c27b3338af682bbf50798bfef5f6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 30 12:20:28 2010 +0200
627149 - do not return installtime via xmlrpc when not defined
instead of an upgrade script
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index e177500..8b9bc59 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1195,7 +1195,7 @@ public class SystemHandler extends BaseHandler {
* #prop("string", "release")
* #prop("string", "epoch")
* #prop("string", "arch")
- * #prop("string", "installtime")
+ * #prop_desc("date", "installtime",
"returned only if known")
* #struct_end()
* #array_end()
*/
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 9019960..acca676 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -237,6 +237,9 @@ public class SystemManager extends BaseManager {
if (pkg.get("arch") == null) {
pkg.put("arch",
LocalizationService.getInstance().getMessage("Unknown"));
}
+ if (pkg.get("installtime") == null) {
+ pkg.remove("installtime");
+ }
}
return pkgs;
}
diff --git
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/050-rhnServerPackage_data.sql
b/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/050-rhnServerPackage_data.sql
deleted file mode 100644
index d81b359..0000000
---
a/schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/050-rhnServerPackage_data.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-UPDATE rhnServerPackage SET installtime = created WHERE installtime IS null;
-
commit 2d5555a812abeacab314d76c0112a6fbd1d00a90
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 30 11:47:07 2010 +0200
better create a separate method than override an existing in this case
overriding broke numbering of list tag pages for several pages
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
b/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
index a94d68a..e3faef8 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/DataResult.java
@@ -306,10 +306,10 @@ public class DataResult<T> extends ArrayList<T>
implements List<T> {
* @param c collection to add
* @return if data resule was changed
*/
- public boolean addAll(Collection c) {
- boolean changed = super.addAll(c);
- totalSize += c.size();
- end += c.size();
+ public boolean addDataResult(DataResult dr) {
+ boolean changed = super.addAll(dr);
+ totalSize += dr.size();
+ end += dr.size();
start = totalSize - end;
return changed;
}
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
b/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
index a46c67d..fec892b 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/SelectMode.java
@@ -136,7 +136,7 @@ public class SelectMode extends BaseMode {
inClause.size() - subStart : CachedStatement.BATCH_SIZE;
List subClause = inClause.subList(subStart, subStart + subLength);
DataResult subDr = getQuery().execute(parameters, subClause, this);
- toReturn.addAll(subDr);
+ toReturn.addDataResult(subDr);
subStart += subLength;
}
return toReturn;
commit 3a3b1a97895cd2db8fd2c219f4a1654338181a22
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Aug 27 15:42:37 2010 +0200
do not log if queue is empty for queue tasks
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java
b/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java
index b74d22a..3590aba 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/threaded/TaskQueue.java
@@ -112,7 +112,9 @@ public class TaskQueue {
setupQueue();
List candidates = queueDriver.getCandidates();
queueSize = candidates.size();
- queueDriver.getLogger().info("In the queue: " + queueSize);
+ if (queueSize > 0) {
+ queueDriver.getLogger().info("In the queue: " + queueSize);
+ }
while (candidates.size() > 0 && queueDriver.canContinue()) {
Object candidate = candidates.remove(0);
QueueWorker worker = queueDriver.makeWorker(candidate);
Show replies by date