[jboss-cvs] jboss-seam/examples/booking/src/org/jboss/seam/example/booking ...

[Gavin King]

  User: gavin   
  Date: 06/12/16 09:38:42

  Modified:    examples/booking/src/org/jboss/seam/example/booking 
                        Booking.java
  Log:
  conversation-required
  
  Revision  Changes    Path
  1.13      +2 -2      jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Booking.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Booking.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/booking/src/org/jboss/seam/example/booking/Booking.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- Booking.java	15 Dec 2006 13:26:32 -0000	1.12
  +++ Booking.java	16 Dec 2006 14:38:42 -0000	1.13
  @@ -1,4 +1,4 @@
  -//$Id: Booking.java,v 1.12 2006/12/15 13:26:32 gavin Exp $
  +//$Id: Booking.java,v 1.13 2006/12/16 14:38:42 gavin Exp $
   package org.jboss.seam.example.booking;
   
   import java.io.Serializable;
  @@ -125,7 +125,7 @@
      public String getDescription()
      {
         DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM);
  -      return hotel.getName() + 
  +      return hotel==null ? null : hotel.getName() + 
               ", " + df.format( getCheckinDate() ) + 
               " to " + df.format( getCheckoutDate() );
      }