Fix related to misuse of System.nanoTime

SalusaSecondus · SalusaSecondus · commit 2e8bbed604d4 · 2016-07-13T09:13:47.000-07:00
diff --git a/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/providers/MostRecentProvider.java b/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/encryption/providers/MostRecentProvider.java
@@ -53,7 +53,7 @@ public MostRecentProvider(final ProviderStore keystore, final String materialNam
     @Override
     public EncryptionMaterials getEncryptionMaterials(EncryptionContext context) {
         State s = state.get();
-        if (System.nanoTime() - s.lastUpdated <= ttlInNanos) {
+        if (s.provider != null && System.nanoTime() - s.lastUpdated <= ttlInNanos) {
             return s.provider.getEncryptionMaterials(context);
         }
         if (s.provider == null || System.nanoTime() - s.lastUpdated > ttlInNanos + TTL_GRACE_IN_NANO) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public MostRecentProvider(final ProviderStore keystore, final String materialNam`
`53`	`53`	`@Override`
`54`	`54`	`public EncryptionMaterials getEncryptionMaterials(EncryptionContext context) {`
`55`	`55`	`State s = state.get();`
`56`		`- if (System.nanoTime() - s.lastUpdated <= ttlInNanos) {`
	`56`	`+ if (s.provider != null && System.nanoTime() - s.lastUpdated <= ttlInNanos) {`
`57`	`57`	`return s.provider.getEncryptionMaterials(context);`
`58`	`58`	`}`
`59`	`59`	`if (s.provider == null \|\| System.nanoTime() - s.lastUpdated > ttlInNanos + TTL_GRACE_IN_NANO) {`