Merge branch 'libs/jetty/upstream' into libs/jetty/local

[gigi.git] / lib / jetty / org / eclipse / jetty / util / FuturePromise.java

diff --git a/lib/jetty/org/eclipse/jetty/util/FuturePromise.java b/lib/jetty/org/eclipse/jetty/util/FuturePromise.java
index f781c85004dc88343897bb8d6c271a8d7b6d1141..09a770b2a0ae7662980e4d901c9d0da6b4c54838 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/util/FuturePromise.java
+++ b/lib/jetty/org/eclipse/jetty/util/FuturePromise.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
@@ -153,7 +153,7 @@ public class FuturePromise<C> implements Future<C>,Promise<C>
     @Override
     public String toString()
     {
-        return String.format("FutureCallback@%x{%b,%b,%s}",hashCode(),_done,_cause==COMPLETED,_result);
+        return String.format("FutureCallback@%x{%b,%b,%s}",hashCode(),_done.get(),_cause==COMPLETED,_result);
     }
     
 }