From c4f1084d20936839852ca1a80ddeb8900546ffde Mon Sep 17 00:00:00 2001 From: Brett Meyer Date: Wed, 10 Jul 2013 13:38:26 -0400 Subject: [PATCH] HHH-8193 copyright dates --- .../src/main/java/org/hibernate/engine/jdbc/BlobProxy.java | 4 ---- .../org/hibernate/test/annotations/lob/locator/LobHolder.java | 2 +- .../test/annotations/lob/locator/LobLocatorTest.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java index e5dae53024..102185cbd9 100644 --- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java +++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/BlobProxy.java @@ -99,12 +99,8 @@ public class BlobProxy implements InvocationHandler { * {@inheritDoc} * * @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#getBinaryStream}, {@link Blob#getBytes}, {@link Blob#free}, ->>>>>>> d7dae6c... HHH-8193 - Reset input stream before binding * or toString/equals/hashCode are invoked. */ @Override diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java index 365dcc72af..d50f49d34b 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobHolder.java @@ -1,7 +1,7 @@ /* * 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 * copyright attribution statements applied by the authors. All * third-party contributions are distributed under license by Red Hat Inc. diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java index b721ed709f..5904aa6a4c 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/lob/locator/LobLocatorTest.java @@ -1,7 +1,7 @@ /* * 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 * copyright attribution statements applied by the authors. All * third-party contributions are distributed under license by Red Hat Inc.