You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2013/12/23 12:58:24 UTC
[1/2] git commit: updated refs/heads/4.3 to 0c6e8ba
Updated Branches:
refs/heads/4.3 5b5812871 -> 0c6e8baa8
CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c6e8baa
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c6e8baa
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c6e8baa
Branch: refs/heads/4.3
Commit: 0c6e8baa8517e7cbd01f187240226409bd54b77b
Parents: 9471797
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Dec 23 17:07:04 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Dec 23 17:28:07 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c6e8baa/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index dd18f74..c7e67c1 100755
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -511,7 +511,7 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase implements RemoteAcc
}
}
}
- } catch (ResourceUnavailableException e) {
+ } catch (Exception e) {
s_logger.warn("Unable to apply vpn users ", e);
success= false;
[2/2] git commit: updated refs/heads/4.3 to 0c6e8ba
Posted by ki...@apache.org.
CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94717975
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94717975
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94717975
Branch: refs/heads/4.3
Commit: 9471797590590313db23e2657d9124e053e681fa
Parents: 5b58128
Author: Kishan Kavala <ki...@cloud.com>
Authored: Mon Dec 23 16:38:56 2013 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Mon Dec 23 17:28:07 2013 +0530
----------------------------------------------------------------------
.../cloud/network/router/VirtualNetworkApplianceManagerImpl.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94717975/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 6c6481d..a970af6 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -4074,6 +4074,9 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V
//Checks if the router is at the required version
// Compares MS version and router version
private boolean checkRouterVersion(VirtualRouter router){
+ if(router.getTemplateVersion() == null){
+ return false;
+ }
String trimmedVersion = Version.trimRouterVersion(router.getTemplateVersion());
return (Version.compare(trimmedVersion, _minVRVersion) >= 0);
}