Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-8193 copyright dates

This commit is contained in:
Brett Meyer 2013-07-10 13:38:26 -04:00
parent 6c2937e3c8
commit c4f1084d20
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java
View File

@ -99,12 +99,8 @@ public class BlobProxy implements InvocationHandler {
* {@inheritDoc} * {@inheritDoc}
* *
* @throws UnsupportedOperationException if any methods other than * @throws UnsupportedOperationException if any methods other than
<<<<<<< HEAD
* {@link Blob#length}, {@link Blob#getBinaryStream}, {@link Blob#getBytes}, {@link Blob#free},
=======
* {@link Blob#length}, {@link BlobImplementer#getUnderlyingStream}, * {@link Blob#length}, {@link BlobImplementer#getUnderlyingStream},
* {@link Blob#getBinaryStream}, {@link Blob#getBytes}, {@link Blob#free}, * {@link Blob#getBinaryStream}, {@link Blob#getBytes}, {@link Blob#free},
>>>>>>> d7dae6c... HHH-8193 - Reset input stream before binding
* or toString/equals/hashCode are invoked. * or toString/equals/hashCode are invoked.
*/ */
@Override @Override

2
hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java
View File

@ -1,7 +1,7 @@
/* /*
* Hibernate, Relational Persistence for Idiomatic Java * Hibernate, Relational Persistence for Idiomatic Java
* *
* Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by * Copyright (c) 2013 by Red Hat Inc and/or its affiliates or by
* third-party contributors as indicated by either @author tags or express * third-party contributors as indicated by either @author tags or express
* copyright attribution statements applied by the authors. All * copyright attribution statements applied by the authors. All
* third-party contributions are distributed under license by Red Hat Inc. * third-party contributions are distributed under license by Red Hat Inc.

2
hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java
View File

@ -1,7 +1,7 @@
/* /*
* Hibernate, Relational Persistence for Idiomatic Java * Hibernate, Relational Persistence for Idiomatic Java
* *
* Copyright (c) 2009 by Red Hat Inc and/or its affiliates or by * Copyright (c) 2013 by Red Hat Inc and/or its affiliates or by
* third-party contributors as indicated by either @author tags or express * third-party contributors as indicated by either @author tags or express
* copyright attribution statements applied by the authors. All * copyright attribution statements applied by the authors. All
* third-party contributions are distributed under license by Red Hat Inc. * third-party contributions are distributed under license by Red Hat Inc.