You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2016/07/17 17:11:39 UTC
svn commit: r1753091 [1/5] - in /db/derby/code/trunk/java:
client/org/apache/derby/client/am/ client/org/apache/derby/client/net/
drda/org/apache/derby/drda/ drda/org/apache/derby/impl/drda/
drda/org/apache/derby/mbeans/drda/ engine/org/apache/derby/ca...
Author: rhillegas
Date: Sun Jul 17 17:11:36 2016
New Revision: 1753091
URL: http://svn.apache.org/viewvc?rev=1753091&view=rev
Log:
DERBY-6856: Fix javadoc warnings raised when compiling Derby javadoc with build 124 of JDK 9: commit derby-6856-09-aa-javadocEntities.diff.
Modified:
db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/FloatingPoint.java
db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java
db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/FormatableBitSet.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/InputStreamUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/locks/Lockable.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/ResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/C_NodeTypes.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CompilerContext.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/CostEstimate.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizable.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/compile/Optimizer.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/conn/LanguageConnectionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/depend/DependencyManager.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/dictionary/RoleClosureIterator.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecPreparedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ExecutionFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/ResultSetFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/sql/execute/RowChanger.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BackingStoreHashtable.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/BinaryOrderable.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/ConglomerateController.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/DatabaseInstant.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/FileResource.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/GroupFetchScanController.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/Qualifier.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowSource.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/RowUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/SortCostController.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/access/TransactionController.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/ContainerLock.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/Page.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RawStoreFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/store/raw/RowLock.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/CharStreamHeaderGenerator.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataType.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataValueDescriptor.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Like.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/NumberDataValue.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/Orderable.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBinary.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLBoolean.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLChar.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDate.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDecimal.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLDouble.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLInteger.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLLongint.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLReal.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLSmallint.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTime.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTimestamp.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/SQLTinyint.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/UserType.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/IdUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/iapi/util/StringUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedBlob.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedCallableStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedDatabaseMetaData.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/EmbedStatement.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/TransactionResourceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/jdbc/authentication/BasicAuthenticationServiceImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/Import.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/load/LoadError.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCJava.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/BCMethod.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/CodeChunk.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/bytecode/Conditional.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/daemon/IndexStatisticsDaemonImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/locks/ActiveLock.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/services/stream/RollingFileStream.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/DD_Version.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/catalog/TabInfoImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryComparisonOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/BinaryOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/CursorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/DMLModStatementNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromBaseTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromList.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/FromTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/GroupByNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/LikeEscapeOperatorNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ModifyColumnNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OptimizerImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/OrderByColumn.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/Predicate.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/PredicateList.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/RelationalOperator.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultColumnList.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ResultSetNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/SubqueryNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNode.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/ValueNodeList.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericLanguageConnectionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/GenericStatementContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/conn/TempTableInfo.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/AlterTableConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/DMLVTIResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/GenericConstantActionFactory.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InternalTriggerExecutionContext.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/JarUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowChangerImpl.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/RowUtil.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TableScanResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/TemporaryRowHolderResultSet.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/UpdateConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/WriteCursorConstantAction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/RAMTransaction.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/StorableFormatId.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeController.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeLockingPolicy.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BTreeScan.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/BranchControlRow.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/btree/ControlRow.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerate.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/access/conglomerate/GenericConglomerateController.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/AllocPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/BasePage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/EncryptOrDecryptData.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/OverflowInputStream.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/RAFContainer4.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredPage.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/data/StoredRecordHeader.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogAccessFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogCounter.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/log/LogToFile.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/TransactionTable.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/raw/xact/XactId.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/buffer/ReplicationLogBuffer.java
db/derby/code/trunk/java/engine/org/apache/derby/impl/store/replication/master/AsynchronousLogShipper.java
db/derby/code/trunk/java/engine/org/apache/derby/jdbc/package.html
db/derby/code/trunk/java/engine/org/apache/derby/vti/DeferModification.java
db/derby/code/trunk/java/engine/org/apache/derby/vti/RestrictedVTI.java
db/derby/code/trunk/java/engine/org/apache/derby/vti/Restriction.java
db/derby/code/trunk/java/shared/org/apache/derby/shared/common/sanity/AssertFailure.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/HandleResult.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/MultiTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/harness/ProcessStreamResult.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/BlobTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbc4/ClobTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CacheSessionDataTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/CharacterStreamsTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/J2EEDataSourceTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMappingTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ResultSetMiscTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/BigDataTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest2.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/GroupByTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/InListMultiProbeTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LangProcedureTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LobMode.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OrderByAndOffsetFetchInSubqueries.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/OuterJoinTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/StatementPlanCacheTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/TriggerGeneralTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UpdatableResultSetTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/largedata/Derby6317Test.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/management/MBeanTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/memorydb/DropWhileConnectingTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/BootAllTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/ClobReclamationTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/Derby4577Test.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/store/StreamingColumnTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/storetests/st_reclaim_longcol.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/upgradeTests/Changes10_9.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/T_Authorize.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestCase.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseJDBCTestSetup.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/BaseTestCase.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBC.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/JDBCPerfTestCase.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Customer.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/District.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/system/oe/model/Order.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/services/T_LockFactory.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_RawStoreFactory.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/unitTests/store/T_Recovery.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/dblook/DB_GrantRevoke.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/ij/StatementFinder.java
db/derby/code/trunk/java/tools/org/apache/derby/impl/tools/optional/DBMDWrapper.java
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/CallableLocatorProcedures.java Sun Jul 17 17:11:36 2016
@@ -409,7 +409,7 @@ class CallableLocatorProcedures
* @param forLength the number of consecutive bytes to be copied; the value
* for length must be 0 or greater. Specifying a length that goes
* beyond the end of the BLOB (i.e., <code>fromPosition + forLength
- * > blob.length()</code>), will result in an error.
+ * > blob.length()</code>), will result in an error.
* @return a byte array containing up to <code>forLength</code> consecutive
* bytes from the <code>BLOB</code> value designated by
* <code>sourceLocator</code>, starting with the byte at position
@@ -484,7 +484,7 @@ class CallableLocatorProcedures
* @param forLength the number of bytes to be written to the
* <code>BLOB</code> value from the array of bytes
* <code>bytes</code>. Specifying a length that goes beyond the end
- * of the BLOB (i.e., <code>fromPosition + forLength >
+ * of the BLOB (i.e., <code>fromPosition + forLength >
* blob.length()</code>, will result in an error.
* @param bytes the array of bytes to be written
*/
@@ -876,7 +876,7 @@ class CallableLocatorProcedures
* @param forLength the number of consecutive characters to be copied; the
* value for length must be 0 or greater. Specifying a length that
* goes beyond the end of the CLOB (i.e., <code>fromPosition +
- * forLength > clob.length()</code>, will result in an error.
+ * forLength > clob.length()</code>, will result in an error.
* @return a string containing up to <code>forLength</code> consecutive
* characters from the <code>CLOB</code> value designated by
* <code>sourceLocator</code>, starting with the character at
@@ -954,7 +954,7 @@ class CallableLocatorProcedures
* @param forLength the number of characters to be written to the
* <code>CLOB</code> value from the string <code>string</code>.
* Specifying a length that goes beyond the end of the CLOB (i.e.,
- * <code>fromPosition + forLength > clob.length()</code>, will
+ * <code>fromPosition + forLength > clob.length()</code>, will
* result in an error.
* @param string the string to be written
*/
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/ClientDatabaseMetaData.java Sun Jul 17 17:11:36 2016
@@ -1159,7 +1159,7 @@ public abstract class ClientDatabaseMeta
* will in turn call
* <code>EmbedDatabaseMetaData.getFunctions(String,String,String)</code><p>
* Compatibility: Only available if both server and client version
- * > 10.1, and JDK version >= 1.6. Older clients will not have
+ * < 10.1, and JDK version >= 1.6. Older clients will not have
* this method available. Newer clients will be able to call this
* method when connected to an older server, but this will be
* trigger an exception in
@@ -1235,7 +1235,7 @@ public abstract class ClientDatabaseMeta
* server. This procedure will in turn call
* <code>EmbedDatabaseMetaData.getFunctionColumns(String,String,
* String,String)</code><p> Compatibility: Only available if both
- * server and client version > 10.1, and JDK version >= 1.6. Older
+ * server and client version > 10.1, and JDK version >= 1.6. Older
* clients will not have this method available. Newer clients will
* be able to call this method when connected to an older server,
* but this will be trigger an exception in
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/FailedProperties40.java Sun Jul 17 17:11:36 2016
@@ -85,11 +85,11 @@ public class FailedProperties40 {
/**
* <code>getProperties</code> provides a
- * <code>Map<String,ClientInfoStatus></code> object describing the
+ * <code>Map<String,ClientInfoStatus></code> object describing the
* failed properties (as specified in the javadoc for
* java.sql.SQLClientInfoException).
*
- * @return a <code>Map<String,ClientInfoStatus></code> object with
+ * @return a <code>Map&glt;String,ClientInfoStatus></code> object with
* the failed property keys and the reason why each failed
*/
public Map<String,ClientInfoStatus> getProperties() { return failedProps_; }
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/FloatingPoint.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/FloatingPoint.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/FloatingPoint.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/FloatingPoint.java Sun Jul 17 17:11:36 2016
@@ -64,9 +64,15 @@ public class FloatingPoint {
//--------------entry points for runtime representation-----------------------
/**
+ * <p>
* Build a Java float from a 4-byte floating point representation.
- * <p/>
- * This includes DERBY types: <ul> <li> REAL <li> FLOAT(1<=n<=24) </ul>
+ * </p>
+ *
+ * <p>
+ * This includes DERBY types:
+ * </p>
+ *
+ * <ul> <li> REAL <li> FLOAT(1<=n<=24) </ul>
*
* @throws IllegalArgumentException if the specified representation is not recognized.
*/
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/am/Lob.java Sun Jul 17 17:11:36 2016
@@ -301,10 +301,10 @@ public abstract class Lob implements Uni
* @param pos a long that contains the position that needs to be checked
* @param length a long that contains the length that needs to be checked
* @throws SQLException if
- * a) pos <= 0
- * b) pos > (length of LOB)
- * c) length < 0
- * d) (pos -1) + length > (length of LOB)
+ * a) pos <= 0
+ * b) pos > (length of LOB)
+ * c) length < 0
+ * d) (pos -1) + length > (length of LOB)
*/
protected void checkPosAndLength(long pos, long length)
throws SQLException {
Modified: db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java (original)
+++ db/derby/code/trunk/java/client/org/apache/derby/client/net/NetConnectionRequest.java Sun Jul 17 17:11:36 2016
@@ -469,10 +469,10 @@ class NetConnectionRequest extends Reque
*
* Relational Database Name specifies the name of a relational database
* of the server.
- * if length of RDB name <= 18 characters, there is not change to the format
+ * if length of RDB name <= 18 characters, there is not change to the format
* of the RDB name. The length of the RDBNAM remains fixed at 18 which includes
* any right bland padding if necessary.
- * if length of the RDB name is > 18 characters, the length of the RDB name is
+ * if length of the RDB name is > 18 characters, the length of the RDB name is
* identical to the length of the RDB name. No right blank padding is required.
* @param rdbnam name of the database.
* @param dontSendOnConversionError omit sending the RDBNAM if there is an
Modified: db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/drda/NetworkServerControl.java Sun Jul 17 17:11:36 2016
@@ -44,24 +44,24 @@ import org.apache.derby.impl.drda.Networ
<P>
<UL>
- <LI>start [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This starts the Network
+ <LI>start [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This starts the Network
Server on the port/host specified or on localhost, port 1527 if no
host/port is specified and no properties are set to override the
defaults. By default a security manager with a default security policy will
be installed. The default security policy file is called server.policy.
By default the Network Server will only listen for
connections from the machine on which it is running.
- Use -h 0.0.0.0 to listen on all interfaces or -h <hostname> to listen
+ Use -h 0.0.0.0 to listen on all interfaces or -h <hostname> to listen
on a specific interface on a multiple IP machine.
For documentation on <sslmode>, consult the Server and Administration Guide.</LI>
<LI>shutdown [-h <host>][-p <portnumber>] [-ssl <sslmode>] [-user <username>] [-password <password>]: This shutdowns the Network Server with given user credentials on the host and port specified or on the local host and port 1527(default) if no host or port is specified. </LI>
- <LI>ping [-h <host>] [-p <portnumber>] [-ssl <sslmode>]
+ <LI>ping [-h <host>] [-p <portnumber>] [-ssl <sslmode>]
This will test whether the Network Server is up.
</LI>
- <LI>sysinfo [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This prints
+ <LI>sysinfo [-h <host>] [-p <portnumber>] [-ssl <sslmode>]: This prints
classpath and version information about the Network Server,
the JVM and the Derby engine.
</LI>
@@ -71,28 +71,28 @@ import org.apache.derby.impl.drda.Networ
prepared statements, and memory usage for the running Network Server.
</LI>
- <LI>logconnections {on | off} [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
+ <LI>logconnections {on | off} [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
This turns logging of connections on or off.
Connections are logged to derby.log.
Default is off.</LI>
- <LI>maxthreads <max> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
+ <LI>maxthreads <max> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
This sets the maximum number of threads that can be used for connections.
Default 0 (unlimitted).
</LI>
- <LI>timeslice <milliseconds> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
+ <LI>timeslice <milliseconds> [-h <host>][-p <portnumber>] [-ssl <sslmode>]:
This sets the time each session can have using a connection thread
before yielding to a waiting session. Default is 0 (no yeild).
</LI>
- <LI>trace {on | off} [-s <session id>] [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
+ <LI>trace {on | off} [-s <session id>] [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
This turns drda tracing on or off for the specified session or if no
session is specified for all sessions. Default is off</LI>
- <LI>tracedirectory <tracedirectory> [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
+ <LI>tracedirectory <tracedirectory> [-h <host>] [-p <portnumber>] [-ssl <sslmode>]:
This changes where new trace files will be placed.
For sessions with tracing already turned on,
trace files remain in the previous location.
@@ -108,13 +108,13 @@ import org.apache.derby.impl.drda.Networ
The following is a list of properties that can be set for
NetworkServerControl:
- <UL><LI>derby.drda.portNumber=<port number>: This property
+ <UL><LI>derby.drda.portNumber=<port number>: This property
indicates which port should be used for the Network Server. </LI>
- <LI>derby.drda.host=<host name or ip address >: This property
+ <LI>derby.drda.host=<host name or ip address >: This property
indicates the ip address to which NetworkServerControl should connect. </LI>
- <LI>derby.drda.traceDirectory=<trace directory>: This property
+ <LI>derby.drda.traceDirectory=<trace directory>: This property
indicates where to put trace files. </LI>
<LI>derby.drda.traceAll=true: This property turns on tracing for
@@ -123,23 +123,23 @@ import org.apache.derby.impl.drda.Networ
<LI>derby.drda.logConnections=true: This property turns on logging
of connections. Default is connections are not logged.</LI>
- <LI>derby.drda.minThreads=<value>: If this property
- is set, the <value> number of threads will be created when the Network Server is
+ <LI>derby.drda.minThreads=<value>: If this property
+ is set, the <value> number of threads will be created when the Network Server is
booted. </LI>
- <LI>derby.drda.maxThreads=<value>: If this property
- is set, the <value> is the maximum number of connection threads that will be
+ <LI>derby.drda.maxThreads=<value>: If this property
+ is set, the <value> is the maximum number of connection threads that will be
created. If a session starts when there are no connection threads available
and the maximum number of threads has been reached, it will wait until a
conection thread becomes available. </LI>
- <LI>derby.drda.timeSlice=<milliseconds>: If this property
+ <LI>derby.drda.timeSlice=<milliseconds>: If this property
is set, the connection threads will not check for waiting sessions until the
- current session has been working for <milliseconds>.
+ current session has been working for <milliseconds>.
A value of 0 causes the thread to work on the current session until the
session exits. If this property is not set, the default value is 0. </LI>
- <LI>derby.drda.sslMode=<sslmode>: This property sets the SSL
+ <LI>derby.drda.sslMode=<sslmode> This property sets the SSL
mode of the server.
</LI>
@@ -206,7 +206,7 @@ public class NetworkServerControl{
* @param address The IP address of the Network Server host.
* address cannot be null.
*
- * @param portNumber port number server is to used. If <= 0,
+ * @param portNumber port number server is to used. If <= 0,
* default port number is used
*
* @param userName The user name for actions requiring authorization.
@@ -258,7 +258,7 @@ public class NetworkServerControl{
* @param address The IP address of the Network Server host.
* address cannot be null.
- * @param portNumber port number server is to used. If <= 0,
+ * @param portNumber port number server is to used. If <= 0,
* default port number is used
*
* @throws Exception on error
@@ -523,7 +523,7 @@ public class NetworkServerControl{
* should also be set so that clients will yield appropriately.
*
* @param max maximum number of connection threads.
- * If <= 0, connection threads will be created when
+ * If <= 0, connection threads will be created when
* there are no free connection threads.
*
* @exception Exception throws an exception if an error occurs
@@ -551,10 +551,10 @@ public class NetworkServerControl{
/**
* Set Network Server connection time slice parameter.
- * This should be set and is only relevant if setMaxThreads > 0.
+ * This should be set and is only relevant if setMaxThreads > 0.
*
* @param timeslice number of milliseconds given to each session before yielding to
- * another session, if <=0, never yield.
+ * another session, if <=0, never yield.
*
* @exception Exception throws an exception if an error occurs
* @see #setMaxThreads
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/AppRequester.java Sun Jul 17 17:11:36 2016
@@ -267,7 +267,7 @@ class AppRequester
/**
* Is this an AppRequester that supports XA
*
- * return true if XAMGR >= 7, false otherwise
+ * return true if XAMGR >= 7, false otherwise
**/
protected boolean isXARequester()
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMReader.java Sun Jul 17 17:11:36 2016
@@ -61,9 +61,9 @@ import org.apache.derby.shared.common.sa
Collections consist of a set of objects in which the entries in the collection
are nested within the length/ code point of the collection.
<P>
- Layer B objects with data >=32763 bytes long format is
+ Layer B objects with data >=32763 bytes long format is
2 bytes Length - length of class, length, and extended total length fields
- (high order bit set, indicating >=32763)
+ (high order bit set, indicating >=32763)
2 bytes Type of the object (code point)
n bytes Extended total length - length of the object
(n = Length - 4)
@@ -261,7 +261,7 @@ class DDMReader
/**
* Is there more in this DDM object
*
- * @return true if DDM length is > 0
+ * @return true if DDM length is > 0
*/
protected boolean moreDdmData()
{
@@ -271,7 +271,7 @@ class DDMReader
/**
* Is there more in this DDS object
*
- * @return true if DDS length is > 0
+ * @return true if DDS length is > 0
*/
protected boolean moreDssData()
{
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DDMWriter.java Sun Jul 17 17:11:36 2016
@@ -1593,7 +1593,7 @@ class DDMWriter
* @param precision Precision of decimal or numeric type
* @param scale declared scale
*
- * @exception SQLException Thrown if # digits > 31
+ * @exception SQLException Thrown if # digits > 31
*/
void writeBigDecimal(BigDecimal b, int precision, int scale)
throws SQLException
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Sun Jul 17 17:11:36 2016
@@ -6283,13 +6283,13 @@ class DRDAConnThread extends Thread {
* SQLCAGRP : FDOCA EARLY GROUP
* SQL Communcations Area Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
* SQLCAXGRP; DRDA TYPE N-GDA; ENVLID 0x52; Length Override 0
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
@@ -6353,13 +6353,13 @@ class DRDAConnThread extends Thread {
* SQLCAGRP : FDOCA EARLY GROUP
* SQL Communcations Area Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
* SQLCAXGRP; DRDA TYPE N-GDA; ENVLID 0x52; Length Override 0
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLCODE; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLSTATE; DRDA TYPE FCS; ENVLID 0x30; Length Override 5
* SQLERRPROC; DRDA TYPE FCS; ENVLID 0x30; Length Override 8
@@ -6561,7 +6561,7 @@ class DRDAConnThread extends Thread {
* SQLCAXGRP : EARLY FDOCA GROUP
* SQL Communications Area Exceptions Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLRDBNME; DRDA TYPE FCS; ENVLID 0x30; Length Override 18
* SQLERRD1; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLERRD2; DRDA TYPE I4; ENVLID 0x02; Length Override 4
@@ -6583,7 +6583,7 @@ class DRDAConnThread extends Thread {
* SQLERRMSG_m; DRDA TYPE VCM; ENVLID 0x3E; Length Override 70
* SQLERRMSG_s; DRDA TYPE VCS; ENVLID 0x32; Length Override 70
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLERRD1; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLERRD2; DRDA TYPE I4; ENVLID 0x02; Length Override 4
* SQLERRD3; DRDA TYPE I4; ENVLID 0x02; Length Override 4
@@ -6859,12 +6859,12 @@ class DRDAConnThread extends Thread {
* SQLDARD : FDOCA EARLY ARRAY
* SQL Descriptor Area Row Description with SQL Communications Area
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLCARD; ROW LID 0x64; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLNUMROW; ROW LID 0x68; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLDAROW; ROW LID 0x60; ELEMENT TAKEN 0(all); REP FACTOR 0(all)
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLCARD; ROW LID 0x64; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLDHROW; ROW LID 0xE0; ELEMENT TAKEN 0(all); REP FACTOR 1
* SQLNUMROW; ROW LID 0x68; ELEMENT TAKEN 0(all); REP FACTOR 1
@@ -7315,7 +7315,7 @@ class DRDAConnThread extends Thread {
* - the outer "do ... while ... " loop processes a ROWSET, one row
* at a time. For non-ROWSET cursors, and for callable statements,
* this loop executes only once.
- * - the inner "for ... i < numCols ..." loop processes each column
+ * - the inner "for ... i < numCols ..." loop processes each column
* in the current row, or each output parmeter in the procedure.
*
* Most column data is written directly inline in the QRYDTA block.
@@ -7909,7 +7909,7 @@ class DRDAConnThread extends Thread {
* SQLDAGRP : EARLY FDOCA GROUP
* SQL Data Area Group Description
*
- * FORMAT FOR SQLAM <= 6
+ * FORMAT FOR SQLAM <= 6
* SQLPRECISION; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLSCALE; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLLENGTH; DRDA TYPE I4; ENVLID 0x02; Length Override 4
@@ -7936,7 +7936,7 @@ class DRDAConnThread extends Thread {
* SQLCOMMENTS_m; DRDA TYPE VCS; ENVLID 0x32; Length Override 254
* SQLUDTGRP; DRDA TYPE N-GDA; ENVLID 0x51; Length Override 0
*
- * FORMAT FOR SQLAM >= 7
+ * FORMAT FOR SQLAM >= 7
* SQLPRECISION; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLSCALE; DRDA TYPE I2; ENVLID 0x04; Length Override 2
* SQLLENGTH; DRDA TYPE I8; ENVLID 0x16; Length Override 8
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DRDAXAProtocol.java Sun Jul 17 17:11:36 2016
@@ -173,18 +173,18 @@ class DRDAXAProtocol {
/**
* parse SYNCTYPE for XAMGR lvl 7
* return synctype value
- * CodePoint.SYNCTYPE_NEW_UOW -> XAResource.start()
- * CodePoint.SYNCTYPE_END_UOW -> XAResource.end()
- * CodePoint.SYNCTYPE_PREPARE -> XAResource.prepare()
- * CodePoint.SYNCTYPE_MIGRATE -> not supported //SYNCPT MGR LEVEL 5
- * CodePoint.SYNCTYPE_REQ_COMMIT -> not supported //SYNCPT MGR LEVEL 5
- * CodePoint.SYNCTYPE_COMMITTED -> XAResource.commit()
+ * CodePoint.SYNCTYPE_NEW_UOW -> XAResource.start()
+ * CodePoint.SYNCTYPE_END_UOW -> XAResource.end()
+ * CodePoint.SYNCTYPE_PREPARE -> XAResource.prepare()
+ * CodePoint.SYNCTYPE_MIGRATE -> not supported //SYNCPT MGR LEVEL 5
+ * CodePoint.SYNCTYPE_REQ_COMMIT -> not supported //SYNCPT MGR LEVEL 5
+ * CodePoint.SYNCTYPE_COMMITTED -> XAResource.commit()
* or local commit for null XID
- * CodePoint.SYNCTYPE_REQ_LOG -> not supported
- * CodePoint.SYNCTYPE_REQ_FORGET -> XAResource.forget()
- * CodePoint.SYNCTYPE_ROLLBACK -> XAResource.rollback()
- * CodePoint.SYNCTYPE_MIGRATED -> not supported
- * CodePoint.SYNCTYPE_INDOUBT -> XAResource.recover();
+ * CodePoint.SYNCTYPE_REQ_LOG -> not supported
+ * CodePoint.SYNCTYPE_REQ_FORGET -> XAResource.forget()
+ * CodePoint.SYNCTYPE_ROLLBACK -> XAResource.rollback()
+ * CodePoint.SYNCTYPE_MIGRATED -> not supported
+ * CodePoint.SYNCTYPE_INDOUBT -> XAResource.recover();
*
*/
protected int parseSYNCTYPE() throws DRDAProtocolException
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/Database.java Sun Jul 17 17:11:36 2016
@@ -443,7 +443,7 @@ class Database
*
* @throws SQLException if metadata call fails
* @return <code>true</code> if locators are supported,
- * <code>false</code otherwise
+ * <code>false</code> otherwise
*/
boolean supportsLocator() throws SQLException
{
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/DecryptionManager.java Sun Jul 17 17:11:36 2016
@@ -439,8 +439,8 @@ class DecryptionManager
The String may be converted back to a byte array using fromHexString.
<BR>
For each byte (b) two characaters are generated, the first character
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
- the second character represents the low nibble (<code>b & 0x0f</code>).
+ represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
+ the second character represents the low nibble (<code>b & 0x0f</code>).
<BR>
The byte at <code>data[offset]</code> is represented by the first two characters in the returned String.
@@ -471,9 +471,9 @@ class DecryptionManager
Convert a string into a byte array in hex format.
<BR>
For each character (b) two bytes are generated, the first byte
- represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
+ represents the high nibble (4 bits) in hexidecimal (<code>b & 0xf0</code>),
the second byte
- represents the low nibble (<code>b & 0x0f</code>).
+ represents the low nibble (<code>b & 0x0f</code>).
<BR>
The character at <code>str.charAt(0)</code> is represented by the first two bytes
in the returned String.
Modified: db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java Sun Jul 17 17:11:36 2016
@@ -3799,7 +3799,7 @@ public final class NetworkServerControlI
* Set the current value of time slice
*
* @param value time slice value
- * @exception Exception if value is < 0
+ * @exception Exception if value is < 0
*/
private void setTimeSlice(int value)
throws Exception
Modified: db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java (original)
+++ db/derby/code/trunk/java/drda/org/apache/derby/mbeans/drda/NetworkServerMBean.java Sun Jul 17 17:11:36 2016
@@ -289,13 +289,13 @@ public interface NetworkServerMBean {
* active if the DrdaMaxThreads attribute (<code>derby.drda.maxThreads</code>
* property) is 0.</p>
* <p>
- * If DrdaMaxThreads is > 0 and DrdaTimeSlice is 0, connections remain
+ * If DrdaMaxThreads is > 0 and DrdaTimeSlice is 0, connections remain
* active until they are closed. If there are more than DrdaMaxThreads
* connections, inactive connections will be waiting for some active
* connection to close. The connection request will return when the
* connection becomes active.</p>
* <p>
- * If DrdaMaxThreads is > 0 and DrdaTimeSlice > 0, connections will be
+ * If DrdaMaxThreads is > 0 and DrdaTimeSlice > 0, connections will be
* alternating beetween active and waiting according to Derby's time
* slicing algorithm.</p>
* <p>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/GetProcedureColumns.java Sun Jul 17 17:11:36 2016
@@ -46,11 +46,11 @@ import org.apache.derby.catalog.types.Ro
METHOD_ID is returned to distinguish between overloaded methods.
<OL>
- <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
- <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
- <LI><B>PROCEDURE_NAME</B> String => procedure name
- <LI><B>COLUMN_NAME</B> String => column/parameter name
- <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
+ <LI><B>PROCEDURE_CAT</B> String => procedure catalog (may be null)
+ <LI><B>PROCEDURE_SCHEM</B> String => procedure schema (may be null)
+ <LI><B>PROCEDURE_NAME</B> String => procedure name
+ <LI><B>COLUMN_NAME</B> String => column/parameter name
+ <LI><B>COLUMN_TYPE</B> Short => kind of column/parameter:
<UL>
<LI> procedureColumnUnknown - nobody knows
<LI> procedureColumnIn - IN parameter
@@ -59,22 +59,22 @@ import org.apache.derby.catalog.types.Ro
<LI> procedureColumnReturn - procedure return value
<LI> procedureColumnResult - result column in ResultSet
</UL>
- <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
- <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
+ <LI><B>DATA_TYPE</B> int => SQL type from java.sql.Types
+ <LI><B>TYPE_NAME</B> String => SQL type name, for a UDT type the
type name is fully qualified
- <LI><B>PRECISION</B> int => precision
- <LI><B>LENGTH</B> int => length in bytes of data
- <LI><B>SCALE</B> short => scale
- <LI><B>RADIX</B> short => radix
- <LI><B>NULLABLE</B> short => can it contain NULL?
+ <LI><B>PRECISION</B> int => precision
+ <LI><B>LENGTH</B> int => length in bytes of data
+ <LI><B>SCALE</B> short => scale
+ <LI><B>RADIX</B> short => radix
+ <LI><B>NULLABLE</B> short => can it contain NULL?
<UL>
<LI> procedureNoNulls - does not allow NULL values
<LI> procedureNullable - allows NULL values
<LI> procedureNullableUnknown - nullability unknown
</UL>
- <LI><B>REMARKS</B> String => comment describing parameter/column
- <LI><B>METHOD_ID</B> Short => Derby extra column (overloading)
- <LI><B>PARAMETER_ID</B> Short => Derby extra column (output order)
+ <LI><B>REMARKS</B> String => comment describing parameter/column
+ <LI><B>METHOD_ID</B> Short => Derby extra column (overloading)
+ <LI><B>PARAMETER_ID</B> Short => Derby extra column (output order)
</OL>
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/SystemProcedures.java Sun Jul 17 17:11:36 2016
@@ -2157,7 +2157,7 @@ public class SystemProcedures {
/**
* this procedure switches between the different xplain modes
- * @param mode either 0 for explain only, or 1 for explain & execute (default)
+ * @param mode either 0 for explain only, or 1 for explain and execute (default)
* @throws SQLException
*/
public static void SYSCS_SET_XPLAIN_MODE(int mode)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/ErrorLogReader.java Sun Jul 17 17:11:36 2016
@@ -56,13 +56,13 @@ import org.apache.derby.impl.jdbc.EmbedR
<PRE>SELECT vti.ts, threadid, cast(xid as int) as xid_int, cast(lccid as int) as lccid_int, logtext
FROM new org.apache.derby.diag.ErrorLogReader() vti,
(VALUES timestampConstant) t(ts)
- WHERE vti.ts <= t.ts AND
- vti.ts >
+ WHERE vti.ts <= t.ts AND
+ vti.ts >
(SELECT MAX(ts) IS NULL ? '2000-01-01 00:00:00.1' : MAX(ts)
FROM new org.apache.derby.diag.ErrorLogReader() vti_i
WHERE (logtext LIKE 'Committing%' OR
logtext LIKE 'Rolling%') AND
- vti.xid = vti_i.xid AND ts < t.ts)
+ vti.xid = vti_i.xid AND ts < t.ts)
ORDER BY xid_int, vti.ts
</PRE>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/diag/LockTable.java Sun Jul 17 17:11:36 2016
@@ -106,7 +106,7 @@ public class LockTable extends VTITempla
/**
The normal way of instantiating a LockTable, equivalent to
- LockTable(org.apache.derby.diag.LockTable->TABLE_AND_ROWLOCK).
+ LockTable(org.apache.derby.diag.LockTable->TABLE_AND_ROWLOCK).
Only shows row and table lock and not latches. Latches are generally
held for very short duration and are not of interest to Derby
users. Only under abnormal circumstances will one be interested in
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/error/ExceptionUtil.java Sun Jul 17 17:11:36 2016
@@ -136,7 +136,7 @@ public class ExceptionUtil
* The result is returned as a string, ready to print.
*
* If the JVM doesn't have the method Thread.getAllStackTraces
- * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
+ * i.e, we are on a JVM < 1.5, or if we don't have the permissions:
* java.lang.RuntimePermission "getStackTrace" and "modifyThreadGroup",
* a message saying so is returned instead.
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/BrokeredStatement.java Sun Jul 17 17:11:36 2016
@@ -290,7 +290,7 @@ public class BrokeredStatement implement
* this result is a ResultSet. getMoreResults also implicitly
* closes any current ResultSet obtained with getResultSet.
*
- * There are no more results when (!getMoreResults() &&
+ * There are no more results when (!getMoreResults() &&
* (getUpdateCount() == -1)
*
* @return true if the next result is a ResultSet; false if it is
@@ -345,7 +345,7 @@ public class BrokeredStatement implement
*
* @param rows the number of rows to fetch
* @exception SQLException if a database-access error occurs, or the
- * condition 0 <= rows <= this.getMaxRows() is not satisfied.
+ * condition 0 <= rows <= this.getMaxRows() is not satisfied.
*/
public final void setFetchSize(int rows) throws SQLException
{
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/FailedProperties40.java Sun Jul 17 17:11:36 2016
@@ -83,11 +83,11 @@ public class FailedProperties40 {
/**
* <code>getProperties</code> provides a
- * <code>Map<String,ClientInfoStatus></code> object describing the
+ * <code>Map&glt;String,ClientInfoStatus></code> object describing the
* failed properties (as specified in the javadoc for
* java.sql.SQLClientInfoException).
*
- * @return a <code>Map<String,ClientInfoStatus></code> object with
+ * @return a <code>Map<String,ClientInfoStatus></code> object with
* the failed property keys and the reason why each failed
*/
public Map<String,ClientInfoStatus> getProperties() { return failedProps_; }
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/jdbc/ResourceAdapter.java Sun Jul 17 17:11:36 2016
@@ -171,7 +171,7 @@ import org.apache.derby.iapi.error.Stand
* <BR>
*
* |-------------|
-* |======= produces=>| <B>XAResource</B> |
+* |======= produces=>| <B>XAResource</B> |
* || |-------------|
* || |
* || has A
@@ -179,13 +179,13 @@ import org.apache.derby.iapi.error.Stand
* || |---------------------
* || V
* |--------------| produces |--------------|
-* | <B>XADataSource</B> |=========>| <B>XAConnection</B>
+* | <B>XADataSource</B> |=========>| <B>XAConnection</B>
* |--------------| |--------------|
* | |
* extends extends
* | |
* | |-----------------------| |----------------------|
-* | | DB2jPooledConnection |==>| BrokeredConnection |
+* | | DB2jPooledConnection |==>| BrokeredConnection |
* | |-----------------------| |----------------------|
* | | ^ |
* | has A | has A
@@ -198,7 +198,7 @@ import org.apache.derby.iapi.error.Stand
* | |
* V V
* |------------| |----------------------| |-----------------------|
-* | JDBCDriver |=produces=>| DetachableConnection |==>| XATransactionResource |
+* | JDBCDriver |=produces=>| DetachableConnection |==>| XATransactionResource |
* | LocalDriver| |----------------------| | |
* |------------| | | points to : |
* | |XATransactionController|
@@ -210,7 +210,7 @@ import org.apache.derby.iapi.error.Stand
* extends extends
* | |
* |-----------------| |-----------------------|
-* | EmbedConnection |-- ?-->| TransactionResource |
+* | EmbedConnection |-- ?-->| TransactionResource |
* |-----------------| |-----------------------|
*
*
@@ -227,7 +227,7 @@ import org.apache.derby.iapi.error.Stand
* | ||
* | \/
* | |-----------------------| |----------------------|
-* | | <B>DB2jPooledConnection</B> |==>| <B>BrokeredConnection</B> |
+* | | <B>DB2jPooledConnection</B> |==>| <B>BrokeredConnection</B> |
* | |-----------------------| |----------------------|
* | | ^ |
* | has A | has A
@@ -240,7 +240,7 @@ import org.apache.derby.iapi.error.Stand
* | |
* V V
* |------------| |----------------------| |-----------------------|
-* | JDBCDriver |=produces=>| EmbedConnection |==>| TransactionResource |
+* | JDBCDriver |=produces=>| EmbedConnection |==>| TransactionResource |
* | LocalDriver| |----------------------| |-----------------------|
* |------------|
*
@@ -258,7 +258,7 @@ import org.apache.derby.iapi.error.Stand
* |
* V
* |------------| |-----------------| |-----------------------|
-* | JDBCDriver |==produces=>| <B>EmbedConnection</B> |- ?->| TransactionResource |
+* | JDBCDriver |==produces=>| <B>EmbedConnection</B> |- ?->| TransactionResource |
* | LocalDriver| |-----------------| |-----------------------|
* |------------|
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Attribute.java Sun Jul 17 17:11:36 2016
@@ -311,7 +311,7 @@ public interface Attribute {
* database owner power before proceeding. The purpose is to
* avoid failing soft upgrade due to a feature being set but not
* supported until after hard upgrade has taken place (e.g. during
- * hard upgrade from 10.1 -> 10.3 or higher if
+ * hard upgrade from 10.1 -> 10.3 or higher if
* derby.database.sqlAuthorization is set,
* cf. DD_Version#checkVersion).
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/reference/Property.java Sun Jul 17 17:11:36 2016
@@ -123,7 +123,7 @@ public interface Property {
/**
derby.stream.error.field=
- <className>.<fieldName> returning an OutputStream or Writer object>
+ className.fieldName returning an OutputStream or Writer object
*/
String ERRORLOG_FIELD_PROPERTY = "derby.stream.error.field";
@@ -1318,16 +1318,20 @@ public interface Property {
/**
+ * <p>
* derby.storage.useDefaultFilePermissions = {false,true}
- * <p/>
+ * </p>
+ * <p>
* When set to true, the store system will not limit file permissions of
* files created by Derby to owner, but rely on the current OS default. On
- * Unix, this is determined by {@code umask(1)}. Only relevant for JVM >=
+ * Unix, this is determined by {@code umask(1)}. Only relevant for JVM >=
* 6.
- * <p/>
+ * </p>
+ * <p>
* The default value is {@code true} on embedded, but {@code false} on the
* Network server if started from command line, otherwise it is true for
* the server, too (i.e. started via API).
+ * </p>
*/
String STORAGE_USE_DEFAULT_FILE_PERMISSIONS =
"derby.storage.useDefaultFilePermissions";
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/compiler/MethodBuilder.java Sun Jul 17 17:11:36 2016
@@ -62,7 +62,7 @@ public interface MethodBuilder {
/**
Push a parameter value.
<PRE>
- Stack ... =>
+ Stack ... =>
...,param_value
</PRE>
@param id position of the parameter (zero based).
@@ -72,7 +72,7 @@ public interface MethodBuilder {
/**
Push a byte constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,byte_value
</PRE>
*/
@@ -81,7 +81,7 @@ public interface MethodBuilder {
/**
Push a boolean constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,boolean_value
</PRE>
*/
@@ -90,7 +90,7 @@ public interface MethodBuilder {
/**
Push a short constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,short_value
</PRE>
*/
@@ -99,7 +99,7 @@ public interface MethodBuilder {
/**
Push a int constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,int_value
</PRE>
*/
@@ -108,7 +108,7 @@ public interface MethodBuilder {
/**
Push a long constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,long_value
</PRE>
*/
@@ -117,7 +117,7 @@ public interface MethodBuilder {
/**
Push a float constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,float_value
</PRE>
*/
@@ -126,7 +126,7 @@ public interface MethodBuilder {
/**
Push a double constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,double_value
</PRE>
*/
@@ -135,7 +135,7 @@ public interface MethodBuilder {
/**
Push a String constant onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,String_value
</PRE>
*/
@@ -144,7 +144,7 @@ public interface MethodBuilder {
/**
Push a typed null onto the stack
<PRE>
- Stack ... =>
+ Stack ... =>
...,null
</PRE>
*/
@@ -154,7 +154,7 @@ public interface MethodBuilder {
Push the contents of the local field onto the stack.
This call pushes the this instance required to access the field itself.
<PRE>
- Stack ... =>
+ Stack ... =>
...,field_value
</PRE>
@@ -166,7 +166,7 @@ public interface MethodBuilder {
This call requires the instance (reference) to be pushed by the caller.
<PRE>
- Stack ...,field_ref =>
+ Stack ...,field_ref =>
...,field_value
</PRE>
@@ -176,7 +176,7 @@ public interface MethodBuilder {
/**
Push the contents of the described static field onto the stack.
<PRE>
- Stack ... =>
+ Stack ... =>
...,field_value
</PRE>
*/
@@ -188,7 +188,7 @@ public interface MethodBuilder {
This call does not leave any value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...
</PRE>
*/
@@ -200,7 +200,7 @@ public interface MethodBuilder {
Like the Java language 'field = value', this leaves the value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,value
</PRE>
*/
@@ -212,7 +212,7 @@ public interface MethodBuilder {
Like the Java language 'field = value', this leaves the value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,value
</PRE>
*/
@@ -224,7 +224,7 @@ public interface MethodBuilder {
Like the Java language 'field = value', this leaves the value on the stack.
<PRE>
- Stack ...,field_ref,value =>
+ Stack ...,field_ref,value =>
...,value
</PRE>
*/
@@ -238,7 +238,7 @@ public interface MethodBuilder {
calls.
<PRE>
- Stack ... => [unchanged]
+ Stack ... => [unchanged]
...
</PRE>
@@ -253,7 +253,7 @@ public interface MethodBuilder {
to the newly created object.
<PRE>
- Stack ...,value* => [numArgs number of values will be popped]
+ Stack ...,value* => [numArgs number of values will be popped]
...,new_ref
</PRE>
@@ -265,7 +265,7 @@ public interface MethodBuilder {
Create an instance of an array and push it onto the stack.
<PRE>
- Stack ... =>
+ Stack ... =>
...,array_ref
</PRE>
@@ -278,7 +278,7 @@ public interface MethodBuilder {
/**
Push this onto the stack.
<PRE>
- Stack ... =>
+ Stack ... =>
...,this_ref
</PRE>
*/
@@ -289,7 +289,7 @@ public interface MethodBuilder {
by upcasting method parameters. It does not put any casting code into the
byte code stream. Can only be used for refrences.
<PRE>
- Stack ...,ref =>
+ Stack ...,ref =>
...,ref
</PRE>
*/
@@ -299,7 +299,7 @@ public interface MethodBuilder {
Cast the top stack value. Correctly down-casts a reference or casts
a primitive type (e.g. int to short).
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,cast_value
</PRE>
@@ -311,7 +311,7 @@ public interface MethodBuilder {
Pop the top stack value and push a boolean that is the result of
an instanceof check on the popped reference.
<PRE>
- Stack ...,ref =>
+ Stack ...,ref =>
...,boolean_value
</PRE>.
*/
@@ -320,7 +320,7 @@ public interface MethodBuilder {
/**
* Pop the top value off the stack
<PRE>
- Stack ..., value =>
+ Stack ..., value =>
...
</PRE>.
*/
@@ -332,11 +332,11 @@ public interface MethodBuilder {
Must only be called if zero or one item exists
on the stack.
<PRE>
- Stack value =>
+ Stack value =>
:empty:
or
- Stack :empty: =>
+ Stack :empty: =>
:empty:
</PRE>.
@@ -349,11 +349,11 @@ public interface MethodBuilder {
on the stack. If the stack contains a single
value then that is popped and used as the returned value.
<PRE>
- Stack value =>
+ Stack value =>
:empty:
or
- Stack :empty: =>
+ Stack :empty: =>
:empty:
</PRE>.
@@ -386,7 +386,7 @@ public interface MethodBuilder {
value, then they must use the same number of values from the stack.
<PRE>
- Stack ...,ref =>
+ Stack ...,ref =>
...
</PRE>.
@@ -403,7 +403,7 @@ public interface MethodBuilder {
and restrictions.
<PRE>
- Stack ...,boolean_value =>
+ Stack ...,boolean_value =>
...
</PRE>.
*/
@@ -435,12 +435,12 @@ public interface MethodBuilder {
<PRE>
static methods
- Stack ...,value* => [numArgs number of values will be popped]
+ Stack ...,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
non-static methods
- Stack ...,ref,value* => [numArgs number of values will be popped]
+ Stack ...,ref,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
</PRE>
@@ -477,12 +477,12 @@ public interface MethodBuilder {
<PRE>
static methods
- Stack ...,value* => [numArgs number of values will be popped]
+ Stack ...,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
non-static methods
- Stack ...,ref,value* => [numArgs number of values will be popped]
+ Stack ...,ref,value* => [numArgs number of values will be popped]
...,return_value [void methods will not push a value]
</PRE>
@@ -493,7 +493,7 @@ public interface MethodBuilder {
Call super(). Caller must only add this to a constructor.
<PRE>
- Stack ... =>
+ Stack ... =>
...
</PRE>
@@ -503,7 +503,7 @@ public interface MethodBuilder {
/**
Pop an array refrence off the stack and push an element from that array.
<PRE>
- Stack ...,array_ref =>
+ Stack ...,array_ref =>
...,value
</PRE>
@@ -514,7 +514,7 @@ public interface MethodBuilder {
/**
Pop an array reference off the stack, store a value in the array at the passed in offset.
<PRE>
- Stack ...,array_ref, value =>
+ Stack ...,array_ref, value =>
...
</PRE>
@@ -526,7 +526,7 @@ public interface MethodBuilder {
/**
Swap the top two values on the stack.
<PRE>
- Stack ...,valueA,valueB =>
+ Stack ...,valueA,valueB =>
...,valueB,valueA
</PRE>
*/
@@ -535,7 +535,7 @@ public interface MethodBuilder {
/**
Duplicate the top value on the stack.
<PRE>
- Stack ...,value =>
+ Stack ...,value =>
...,value,value
</PRE>
*/
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/context/ContextService.java Sun Jul 17 17:11:36 2016
@@ -70,7 +70,7 @@ public final class ContextService //OLD
set to -1. This is because nesting is solely represented by
the stack, with the current context manager on top of the stack.
This supports multiple levels of nesting across two stacks, e.g.
- C1->C2->C2->C1->C2.
+ C1->C2->C2->C1->C2.
</UL>
This thread local is used to find the current context manager. Basically it provides
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/info/ProductVersionHolder.java Sun Jul 17 17:11:36 2016
@@ -58,7 +58,7 @@ import java.util.Properties;
is represented by a int (2G values) we have plenty of room for encoding. If we assign a given
majorVersion.minorVersion.fixPack a 10 year life, then we about the maximum number of individual releases
it can have is 10 years * 365 days/year = 3650. Thus with the pre 5.2 scheme we would not expect a
- 5.1.x to have an x > 3650 (approximately). Usually the rate of point releases has been much less than
+ 5.1.x to have an x > 3650 (approximately). Usually the rate of point releases has been much less than
one per day, 5.1.31 is released about 225 days after GA which makes around a point release every 7 days.
But in the encoding we need to be conservative. With fix packs the maximum is about 2 per year and fix
packs are only made to the current release, thus with a yearly minor release cycle we would imagine
@@ -80,9 +80,9 @@ import java.util.Properties;
The encoding number must continue to increase so that the
- encodedMaintB > encodedMaintA
+ encodedMaintB > encodedMaintA
- if (fixPackB > fixPackA) || ((fixPackB == fixPackA) && (bugB > bugA))
+ if (fixPackB > fixPackA) || ((fixPackB == fixPackA) && (bugB > bugA))
Selected encoding
@@ -368,10 +368,10 @@ public final class ProductVersionHolder
/**
* Return the build number as an integer if possible,
* mapping from the SVN number.
- * nnnnn -> returns nnnnn
- * nnnnnM -> returns -nnnnn indicates a modified code base
- * nnnnn:mmmmm -> returns -nnnnn
- * anything else -> returns -1
+ * nnnnn -> returns nnnnn
+ * nnnnnM -> returns -nnnnn indicates a modified code base
+ * nnnnn:mmmmm -> returns -nnnnn
+ * anything else -> returns -1
*/
public int getBuildNumberAsInt(){
if (buildNumber == null)
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/ArrayInputStream.java Sun Jul 17 17:11:36 2016
@@ -549,9 +549,9 @@ public final class ArrayInputStream exte
*
* Formats are (with x representing value bits):
* <PRE>
- * 1 Byte- 00xxxxxx val <= 63 (0x3f)
- * 2 Byte- 01xxxxxx xxxxxxxx val > 63 && <= 16383 (0x3fff)
- * 4 byte- 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx val > 16383 && <= MAX_INT
+ * 1 Byte- 00xxxxxx val <= 63 (0x3f)
+ * 2 Byte- 01xxxxxx xxxxxxxx val > 63 && <= 16383 (0x3fff)
+ * 4 byte- 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx val > 16383 && <= MAX_INT
* </PRE>
*
* @exception IOException if an I/O error happens
@@ -637,13 +637,13 @@ public final class ArrayInputStream exte
*
* Formats are (with x representing value bits):
* <PRE>
- * value <= 16383 (0x3fff):
+ * value ≷= 16383 (0x3fff):
* 2 byte - 00xxxxxx xxxxxxxx
*
- * value > 16383 && <= 0x3fffffff:
+ * value > 16383 && <= 0x3fffffff:
* 4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
*
- * value > 0x3fffffff && <= MAX_LONG:
+ * value < 0x3fffffff &< <= MAX_LONG:
* 8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx
* </PRE>
*
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/CompressedNumber.java Sun Jul 17 17:11:36 2016
@@ -54,9 +54,9 @@ public abstract class CompressedNumber {
Write a compressed integer only supporting signed values.
Formats are (with x representing value bits):
<PRE>
- 1 Byte - 00xxxxxx Represents the value <= 63 (0x3f)
- 2 Byte - 01xxxxxx xxxxxxxx Represents the value > 63 && <= 16383 (0x3fff)
- 4 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= MAX_INT
+ 1 Byte - 00xxxxxx Represents the value <= 63 (0x3f)
+ 2 Byte - 01xxxxxx xxxxxxxx Represents the value > 63 && <= 16383 (0x3fff)
+ 4 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= MAX_INT
</PRE>
@@ -281,9 +281,9 @@ public abstract class CompressedNumber {
Formats are (with x representing value bits):
<PRE>
- 2 byte - 00xxxxxx xxxxxxxx Represents the value <= 16383 (0x3fff)
- 4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= 0x3fffffff
- 8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 0x3fffffff && <= MAX_LONG
+ 2 byte - 00xxxxxx xxxxxxxx Represents the value <= 16383 (0x3fff)
+ 4 byte - 01xxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 16383 && <= 0x3fffffff
+ 8 byte - 1xxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx xxxxxxxx Represents the value > 0x3fffffff && <= MAX_LONG
</PRE>
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DataInputUtil.java Sun Jul 17 17:11:36 2016
@@ -35,7 +35,7 @@ public final class DataInputUtil {
* @param in
* DataInput to be skipped.
* @param skippedBytes
- * number of bytes to skip. if skippedBytes <= zero, do nothing.
+ * number of bytes to skip. if skippedBytes <= zero, do nothing.
* @throws java.io.EOFException
* if EOF meets before requested number of bytes are skipped.
* @throws IOException
Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java?rev=1753091&r1=1753090&r2=1753091&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/services/io/DynamicByteArrayOutputStream.java Sun Jul 17 17:11:36 2016
@@ -217,8 +217,8 @@ public class DynamicByteArrayOutputStrea
expansion.
<UL>
- <LI> buf.length < 128k - increase by 4k
- <LI> buf.length < 1Mb - increase by 128k
+ <LI> buf.length < 128k - increase by 4k
+ <LI> buf.length < 1Mb - increase by 128k
<LI> otherwise increase by 1Mb.
</UL>