[jboss-cvs] JBossCache/src/org/jboss/cache/marshall ...

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/28 23:15:43

  Modified:    src/org/jboss/cache/marshall  Tag: Branch_JBossCache_1_4_0
                        VersionAwareMarshaller.java
  Log:
  [JBAS-883] Don't hide true cause of marshalling failures
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.2   +10 -2     JBossCache/src/org/jboss/cache/marshall/VersionAwareMarshaller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: VersionAwareMarshaller.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/VersionAwareMarshaller.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -b -r1.5.2.1 -r1.5.2.2
  --- VersionAwareMarshaller.java	6 Jul 2006 10:52:13 -0000	1.5.2.1
  +++ VersionAwareMarshaller.java	29 Nov 2006 04:15:43 -0000	1.5.2.2
  @@ -181,9 +181,17 @@
                       log.info("Caught exception unmarshalling stream with specific versioned marshaller " + marshaller.getClass() + ".  Attempting to try again with legacy marshaller " + LegacyTreeCacheMarshaller.class);
                   }
                   // create a more 'compatible' ObjectInputStream.
  +                try
  +                {
                   in = new MarshalledValueInputStream(new ByteArrayInputStream(buf));
                   return getMarshaller(VERSION_LEGACY).objectFromStream(in);
               }
  +                catch (Exception e1)
  +                {
  +                   log.debug("Retry with legacy marshaller failed as well; throwing original exception", e1);
  +                   throw e;
  +                }
  +            }
           }
       }