From 8f0ad364514185cbf95d870589aaa3b2ef4daa67 Mon Sep 17 00:00:00 2001
From: Robert Panzer <robert.panzer@me.com>
Date: Thu, 19 May 2016 18:53:59 +0200
Subject: [PATCH] Use the correct instances to destroy CDI beans obtained from
 Instances.

---
 .../java/org/javaee7/cdi/instance/AnyGreetingTest.java | 10 ++++++----
 .../java/org/javaee7/cdi/instance/GreetingTest.java    |  6 ++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java b/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java
index 93ced11ac..5ba5381cd 100644
--- a/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java
+++ b/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java
@@ -49,13 +49,15 @@ public void test() throws Exception {
 		assertTrue(instance.isAmbiguous());
 
 		// use Instance<T>#select()
-		Greeting businessBean = instance.select(new AnnotationLiteral<Business>() {}).get();
+		Instance<Greeting> businessInstance = instance.select(new AnnotationLiteral<Business>() {});
+		Greeting businessBean = businessInstance.get();
 		assertThat(businessBean, instanceOf(FormalGreeting.class));
-		instance.destroy(businessBean);
+		businessInstance.destroy(businessBean);
 
-		Greeting defaultBean = instance.select(new AnnotationLiteral<Default>() {}).get();
+		Instance<Greeting> defaultInstance = instance.select(new AnnotationLiteral<Default>() {});
+		Greeting defaultBean = defaultInstance.get();
 		assertThat(defaultBean, instanceOf(SimpleGreeting.class));
-		instance.destroy(defaultBean);
+		defaultInstance.destroy(defaultBean);
 	}
 }
 
diff --git a/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java b/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java
index 6046ff036..2ececdc82 100644
--- a/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java
+++ b/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java
@@ -54,9 +54,11 @@ public void test() throws Exception {
 		instance.destroy(bean);
 
 		// use Instance<T>#select()
-		Greeting anotherBean = instance.select(new AnnotationLiteral<Default>() {}).get();
+		Instance<Greeting> anotherInstance = instance.select(new AnnotationLiteral<Default>() {
+		});
+		Greeting anotherBean = anotherInstance.get();
 		assertThat(anotherBean, instanceOf(SimpleGreeting.class));
-		instance.destroy(anotherBean);
+		anotherInstance.destroy(anotherBean);
 	}
 }