lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fallback Pre-Multi tenancy (#547)

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2017-06-20 19:48:09 +02:00
committed by GitHub
parent 648123c1d7
commit 083a84aebd
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
extensions/hawkbit-extension-artifact-repository-mongo/src/main/java/org/eclipse/hawkbit/artifact/repository/MongoDBArtifactStore.java
View File

@@ -91,8 +91,16 @@ public class MongoDBArtifactStore implements ArtifactRepository {
@Override @Override
public DbArtifact getArtifactBySha1(final String tenant, final String sha1Hash) { public DbArtifact getArtifactBySha1(final String tenant, final String sha1Hash) {
return map(gridFs.findOne(new Query() GridFSDBFile found = gridFs.findOne(new Query()
.addCriteria(Criteria.where(FILENAME).is(sha1Hash).and(TENANT_QUERY).is(sanitizeTenant(tenant))))); .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 @Override