Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
016eaffa
Commit
016eaffa
authored
Oct 04, 2018
by
Ashutosh Mestry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2897: Better handling of empty zip files.
parent
8a26c79e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
AtlasServerService.java
...rg/apache/atlas/repository/impexp/AtlasServerService.java
+0
-1
ZipSource.java
...in/java/org/apache/atlas/repository/impexp/ZipSource.java
+8
-4
No files found.
repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java
View file @
016eaffa
...
@@ -65,7 +65,6 @@ public class AtlasServerService {
...
@@ -65,7 +65,6 @@ public class AtlasServerService {
try
{
try
{
return
dataAccess
.
load
(
server
);
return
dataAccess
.
load
(
server
);
}
catch
(
AtlasBaseException
e
)
{
}
catch
(
AtlasBaseException
e
)
{
LOG
.
error
(
"dataAccess"
,
e
);
throw
e
;
throw
e
;
}
}
}
}
...
...
repository/src/main/java/org/apache/atlas/repository/impexp/ZipSource.java
View file @
016eaffa
...
@@ -72,10 +72,14 @@ public class ZipSource implements EntityImportStream {
...
@@ -72,10 +72,14 @@ public class ZipSource implements EntityImportStream {
}
}
private
boolean
isZipFileEmpty
()
{
private
boolean
isZipFileEmpty
()
{
return
MapUtils
.
isEmpty
(
guidEntityJsonMap
)
||
if
(
MapUtils
.
isEmpty
(
guidEntityJsonMap
))
{
(
guidEntityJsonMap
.
containsKey
(
ZipExportFileNames
.
ATLAS_EXPORT_ORDER_NAME
.
toString
())
&&
return
true
;
(
guidEntityJsonMap
.
get
(
ZipExportFileNames
.
ATLAS_EXPORT_ORDER_NAME
.
toString
())
==
null
)
}
);
String
key
=
ZipExportFileNames
.
ATLAS_EXPORT_ORDER_NAME
.
toString
();
return
(
guidEntityJsonMap
.
containsKey
(
key
)
&&
StringUtils
.
isNotEmpty
(
guidEntityJsonMap
.
get
(
key
))
&&
guidEntityJsonMap
.
get
(
key
).
equals
(
"[]"
));
}
}
public
ImportTransforms
getImportTransform
()
{
return
this
.
importTransform
;
}
public
ImportTransforms
getImportTransform
()
{
return
this
.
importTransform
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment