From 4de2b892ef2fcd1bd4dba1e6c76d892617d84e7c Mon Sep 17 00:00:00 2001
From: Jeremy Gustie <jeremy@gustie.com>
Date: Wed, 16 Apr 2014 22:13:32 -0400
Subject: [PATCH] Do not take the first compatible representation if there are
 more then one, issue #908

---
 .../org/restlet/engine/local/EntityClientHelper.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/modules/org.restlet/src/org/restlet/engine/local/EntityClientHelper.java b/modules/org.restlet/src/org/restlet/engine/local/EntityClientHelper.java
index 5717d06608..1e949d6e60 100644
--- a/modules/org.restlet/src/org/restlet/engine/local/EntityClientHelper.java
+++ b/modules/org.restlet/src/org/restlet/engine/local/EntityClientHelper.java
@@ -272,9 +272,14 @@ protected void handleEntityGet(Request request, Response response,
                                 Variant entryVariant = entry.getVariant();
 
                                 if (entityVariant.isCompatible(entryVariant)) {
-                                    // The right representation has been found.
-                                    uniqueVariant = entry;
-                                    break;
+                                    if (uniqueVariant != null) {
+                                        // There are multiple compatible representations.
+                                        uniqueVariant = null;
+                                        break;
+                                    } else {
+                                        // The right representation has been found.
+                                        uniqueVariant = entry;
+                                    }
                                 }
                             }
                         }