diff --git a/sandbox/travelsample/common-contribution/src/scatours/common/Search.java b/sandbox/travelsample/common-contribution/src/scatours/common/Search.java index 4686e9306b..705753972e 100644 --- a/sandbox/travelsample/common-contribution/src/scatours/common/Search.java +++ b/sandbox/travelsample/common-contribution/src/scatours/common/Search.java @@ -30,6 +30,6 @@ import org.osoa.sca.annotations.Remotable; public interface Search { TripItem[] searchSynch(TripLeg tripLeg); - // TODO - Use to run searches in parallel @OneWay + @OneWay void searchAsynch(TripLeg tripLeg); } diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java index e4a641e1e5..e5cc0cae8f 100644 --- a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java +++ b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java @@ -87,7 +87,9 @@ public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{ while (responsesReceived < 3){ try { - this.wait(); + synchronized (this) { + this.wait(); + } } catch (InterruptedException ex){ // do nothing } @@ -114,7 +116,9 @@ public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{ responsesReceived++; try { - this.notifyAll(); + synchronized (this) { + this.notifyAll(); + } } catch (Exception ex) { } } diff --git a/sandbox/travelsample/ui-contribution/scatours.html b/sandbox/travelsample/ui-contribution/scatours.html index 3ac053f059..54ee0c6b3d 100644 --- a/sandbox/travelsample/ui-contribution/scatours.html +++ b/sandbox/travelsample/ui-contribution/scatours.html @@ -206,7 +206,7 @@
-

+

Search for hotels, flights and cars


@@ -233,16 +233,17 @@
+
- +

Search Results


-

You Trip

+