From 083a84aebde927dac40f69c32924f356976d2ba7 Mon Sep 17 00:00:00 2001 From: Kai Zimmermann Date: Tue, 20 Jun 2017 19:48:09 +0200 Subject: [PATCH] Fallback Pre-Multi tenancy (#547) Signed-off-by: kaizimmerm --- .../artifact/repository/MongoDBArtifactStore.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/extensions/hawkbit-extension-artifact-repository-mongo/src/main/java/org/eclipse/hawkbit/artifact/repository/MongoDBArtifactStore.java b/extensions/hawkbit-extension-artifact-repository-mongo/src/main/java/org/eclipse/hawkbit/artifact/repository/MongoDBArtifactStore.java index 5e8909ed3..9631e2ff2 100644 --- a/extensions/hawkbit-extension-artifact-repository-mongo/src/main/java/org/eclipse/hawkbit/artifact/repository/MongoDBArtifactStore.java +++ b/extensions/hawkbit-extension-artifact-repository-mongo/src/main/java/org/eclipse/hawkbit/artifact/repository/MongoDBArtifactStore.java @@ -91,8 +91,16 @@ public class MongoDBArtifactStore implements ArtifactRepository { @Override public DbArtifact getArtifactBySha1(final String tenant, final String sha1Hash) { - return map(gridFs.findOne(new Query() - .addCriteria(Criteria.where(FILENAME).is(sha1Hash).and(TENANT_QUERY).is(sanitizeTenant(tenant))))); + GridFSDBFile found = gridFs.findOne(new Query() + .addCriteria(Criteria.where(FILENAME).is(sha1Hash).and(TENANT_QUERY).is(sanitizeTenant(tenant)))); + + // fallback pre-multi-tenancy + if (found == null) { + found = gridFs.findOne( + new Query().addCriteria(Criteria.where(FILENAME).is(sha1Hash).and(TENANT_QUERY).exists(false))); + } + + return map(found); } @Override