Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MM-3720 | Add minor check #3663

Merged
merged 9 commits into from
Oct 25, 2024
Merged

MM-3720 | Add minor check #3663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c1299ef
Merge pull request #3644 from atlanhq/task2/DG-1791
aarshi0301 Oct 23, 2024
dac0b61
Merge pull request #3648 from atlanhq/MM-3720
aarshi0301 Oct 23, 2024
33673df
add more null checks
aarshi0301 Oct 25, 2024
75502c7
minor code improvement
aarshi0301 Oct 25, 2024
174746a
undo change
aarshi0301 Oct 25, 2024
d606dce
Merge branch 'task/minorMM-3720' into dev/task/minorMM-3720
aarshi0301 Oct 25, 2024
d790748
undo condition
aarshi0301 Oct 25, 2024
fccce0a
add logs
aarshi0301 Oct 25, 2024
b4f86d4
Merge branch 'task/minorMM-3720' into dev/task/minorMM-3720
aarshi0301 Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public AtlasType getType(String typeName) throws AtlasBaseException {

AtlasType ret = registryData.allTypes.getTypeByName(typeName);

if (ret == null) {
if (ret == null ) {
if (typeName.startsWith(ATLAS_TYPE_ARRAY_PREFIX) && typeName.endsWith(ATLAS_TYPE_ARRAY_SUFFIX)) {
int startIdx = ATLAS_TYPE_ARRAY_PREFIX.length();
int endIdx = typeName.length() - ATLAS_TYPE_ARRAY_SUFFIX.length();
Expand Down
8 changes: 6 additions & 2 deletions ...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1690,11 +1690,15 @@ private AtlasStruct mapVertexToStruct(AtlasVertex entityVertex, String edgeLabel
if (GraphHelper.elementExists(edge)) {
final AtlasVertex referenceVertex = edge.getInVertex();

if (referenceVertex == null) {
LOG.error("reference vertex not found on edge {} from vertex {} ", edge.getId(), getGuid(entityVertex));
return ret;
}

String typeName = getTypeName(referenceVertex);

if (StringUtils.isEmpty(typeName)) {
LOG.error("typeName not found for in-vertex {} on edge {} from vertex {} ",
getGuid(referenceVertex), edge.getId(), getGuid(entityVertex));
LOG.error("typeName not found on edge {} from vertex {} ", edge.getId(), getGuid(entityVertex));
return ret;
}

Expand Down
Loading