You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by an...@apache.org on 2014/03/27 23:33:11 UTC
git commit: updated refs/heads/4.4 to bdc4ffc
Repository: cloudstack
Updated Branches:
refs/heads/4.4 503eeb824 -> bdc4ffc01
add more log for creating XS pool network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bdc4ffc0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bdc4ffc0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bdc4ffc0
Branch: refs/heads/4.4
Commit: bdc4ffc0104aed98106fffca3f2292d65b63ded7
Parents: 503eeb8
Author: Anthony Xu <an...@citrix.com>
Authored: Thu Mar 27 15:31:30 2014 -0700
Committer: Anthony Xu <an...@citrix.com>
Committed: Thu Mar 27 15:32:48 2014 -0700
----------------------------------------------------------------------
.../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdc4ffc0/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index e8cc400..372d337 100644
--- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4127,8 +4127,12 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
protected Pair<Long, Integer> parseTimestamp(String timeStampStr) {
String[] tokens = timeStampStr.split("-");
- assert (tokens.length == 3) : "It's our timestamp but it doesn't fit our format: " + timeStampStr;
+ if (tokens.length != 3) {
+ s_logger.debug("timeStamp in network has wrong pattern: " + timeStampStr);
+ return null;
+ }
if (!tokens[0].equals("CsCreateTime")) {
+ s_logger.debug("timeStamp in network doesn't start with CsCreateTime: " + timeStampStr);
return null;
}
return new Pair<Long, Integer>(Long.parseLong(tokens[1]), Integer.parseInt(tokens[2]));