From 914b5fa981ad3c750d10b85ea3169f7e13299af6 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 11 Jun 2012 17:00:39 -0700
Subject: [PATCH] Fixed ip assoc

---
 api/src/com/cloud/api/commands/AssociateIPAddrCmd.java | 4 +---
 wscript                                                | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java b/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
index 15c596be8cd..9663ef2dca1 100644
--- a/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
+++ b/api/src/com/cloud/api/commands/AssociateIPAddrCmd.java
@@ -228,9 +228,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
 
         IpAddress result = null;
         
-        if (getVpcId() != null) {
-            result = _networkService.associateIP(getEntityId(), getNetworkId(), getVpcId());
-        }
+        result = _networkService.associateIP(getEntityId(), getNetworkId(), getVpcId());        
 
         if (result != null) {
             IPAddressResponse ipResponse = _responseGenerator.createIPAddressResponse(result);
diff --git a/wscript b/wscript
index 98c6967b6ab..1cde0e455d6 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
 # if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
 
 
-VERSION = '3.0.3.2012-06-11T22:43:41Z'
+VERSION = '3.0.3.2012-06-11T23:14:43Z'
 APPNAME = 'cloud'
 
 import shutil,os