summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjin xin <j00101220@huawei.com>2016-10-10 07:12:08 +0000
committerGerrit Code Review <gerrit@open-o.org>2016-10-10 07:12:08 +0000
commit533d56dfdc13b468932602cd225389f4ba56d9c8 (patch)
tree64f0d17d3e5e75f015f5724557ba341f017b35e6
parent06b3d059f05212d647e176ef2644622ba8d68a4b (diff)
parent9064db27c583df2bae277c5f297af451917815b0 (diff)
Merge "Resolve the Bug GSO-8"
-rw-r--r--servicegateway/pom.xml6
-rw-r--r--servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java1
2 files changed, 3 insertions, 4 deletions
diff --git a/servicegateway/pom.xml b/servicegateway/pom.xml
index 4b2ed45e..3bbc4294 100644
--- a/servicegateway/pom.xml
+++ b/servicegateway/pom.xml
@@ -114,15 +114,15 @@
<artifactId>jackson-jaxrs</artifactId>
<version>1.9.2</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
- <groupId>com.googlecode.jmockit</groupId>
+ <groupId>org.jmockit</groupId>
<artifactId>jmockit</artifactId>
- <version>1.1</version>
+ <version>1.18</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java
index 07442bb3..113693c8 100644
--- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java
+++ b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java
@@ -148,7 +148,6 @@ public class ServiceGatewayImpl implements IServiceGateway {
service.remove(Constant.SERVICE_OPERATION);
// call the restful
- String id = null;
try {
RestfulResponse restfulRsp = null;
if(Constant.SERVICE_DELETE_OPERATION.equalsIgnoreCase(operation)) {