diff options
author | sun qi <sun.qi310@zte.com.cn> | 2016-10-20 06:01:46 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@open-o.org> | 2016-10-20 06:01:46 +0000 |
commit | af44bcb938d898ffc02b485d0cd55cebab297c8c (patch) | |
tree | 21920590586190280d30bfbca3ae1f295aea4746 /catalog-core/catalog-mgr/src/main/java | |
parent | 537dbf3c6bb923156f51fe7e21be798777a1689b (diff) | |
parent | 18b688c58e9eb37fe23ccb559f49cd7db7a16f0d (diff) |
Merge "Fix the bug "Repeat upload package has logic error"."
Diffstat (limited to 'catalog-core/catalog-mgr/src/main/java')
-rw-r--r-- | catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java index 1358674a..ab206916 100644 --- a/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java +++ b/catalog-core/catalog-mgr/src/main/java/org/openo/commontosca/catalog/wrapper/PackageWrapper.java @@ -129,6 +129,15 @@ public class PackageWrapper { boolean uploadResult = FileManagerFactory.createFileManager().upload(tempDirName, destPath); if (uploadResult == true) { PackageData packageData = PackageWrapperUtil.getPackageData(packageMeta); + ArrayList<PackageData> existPackageDatas = + PackageManager.getInstance().queryPackage(packageData.getName(), + packageData.getProvider(), packageData.getVersion(), null, packageData.getType()); + if (null != existPackageDatas && existPackageDatas.size() > 0) { + LOG.warn("The package already exist ! Begin to delete the orgin data and reupload !"); + for (int i = 0; i < existPackageDatas.size(); i++) { + this.delPackage(existPackageDatas.get(i).getCsarId()); + } + } packateDbData = PackageManager.getInstance().addPackage(packageData); LOG.info("Store package data to database succed ! packateDbData = " + ToolUtil.objectToString(packateDbData)); |