Revision b722cab3 src/com/rackspace/cloud/loadbalancer/api/client/LoadBalancer.java

b/src/com/rackspace/cloud/loadbalancer/api/client/LoadBalancer.java
63 63
	}
64 64

  
65 65
	public void setProtocol(String protocol) {
66
		this.protocol = protocol.toUpperCase();
66
		/*
67
		 * protocol may come in as null if the server
68
		 * has been deleted, so need to check if not 
69
		 * null
70
		 */
71
		if(protocol != null){
72
			this.protocol = protocol.toUpperCase();
73
		} else {
74
			this.protocol = "";
75
		}
67 76
	}
68 77

  
69 78
	public String getPort() {
......
158 167
		return virtualIpType;
159 168
	}
160 169
	
161
	public String setVirtualIpType(String virtualIpType){
162
		return this.virtualIpType = virtualIpType.toUpperCase();
170
	public void setVirtualIpType(String virtualIpType){
171
		/*
172
		 * protocol may come in as null if the server
173
		 * has been deleted, so need to check if not 
174
		 * null
175
		 */
176
		if(virtualIpType != null){
177
		    this.virtualIpType = virtualIpType.toUpperCase();
178
		} else {
179
			this.virtualIpType = "";
180
		}
163 181
	}
164 182
	
165 183
	public String getRegion(){
166 184
		return region;
167 185
	}
168 186
	
169
	public String setRegion(String region){
170
		return this.region = region;
187
	public void setRegion(String region){
188
		this.region = region;
171 189
	}
172 190

  
173 191
	public static long getSerialversionuid() {

Also available in: Unified diff