Changeset: f2689a3e9a95 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/f2689a3e9a95
Modified Files:
src/main/java/org/monetdb/jdbc/MonetBlob.java
src/main/java/org/monetdb/jdbc/MonetConnection.java
src/main/java/org/monetdb/jdbc/MonetStatement.java
src/main/java/org/monetdb/mcl/net/MapiSocket.java
src/main/java/org/monetdb/util/CmdLineOpts.java
Branch: monetdbs
Log Message:
convert space indents to tabs
diffs (195 lines):
diff --git a/src/main/java/org/monetdb/jdbc/MonetBlob.java
b/src/main/java/org/monetdb/jdbc/MonetBlob.java
--- a/src/main/java/org/monetdb/jdbc/MonetBlob.java
+++ b/src/main/java/org/monetdb/jdbc/MonetBlob.java
@@ -299,8 +299,8 @@ public final class MonetBlob implements
try {
offset--;
/* transactions? what are you talking about? */
- if (len - (int) pos >= 0)
- System.arraycopy(bytes, offset + (int) pos, buf, (int) pos,
len - (int) pos);
+ if (len - (int) pos >= 0)
+ System.arraycopy(bytes, offset + (int) pos,
buf, (int) pos, len - (int) pos);
} catch (IndexOutOfBoundsException e) {
throw new SQLException(e.getMessage(), "M0M10");
}
diff --git a/src/main/java/org/monetdb/jdbc/MonetConnection.java
b/src/main/java/org/monetdb/jdbc/MonetConnection.java
--- a/src/main/java/org/monetdb/jdbc/MonetConnection.java
+++ b/src/main/java/org/monetdb/jdbc/MonetConnection.java
@@ -2761,7 +2761,7 @@ public class MonetConnection
@Override
public void close() {
// feed all rows to the garbage collector
- Arrays.fill(data, null);
+ Arrays.fill(data, null);
}
/**
diff --git a/src/main/java/org/monetdb/jdbc/MonetStatement.java
b/src/main/java/org/monetdb/jdbc/MonetStatement.java
--- a/src/main/java/org/monetdb/jdbc/MonetStatement.java
+++ b/src/main/java/org/monetdb/jdbc/MonetStatement.java
@@ -1571,7 +1571,7 @@ final class MonetVirtualResultSet extend
if (row < 1 || row > tupleCount)
return false;
- System.arraycopy(results[row - 1], 0, tlp.values, 0, results[row -
1].length);
+ System.arraycopy(results[row - 1], 0, tlp.values, 0,
results[row - 1].length);
return true;
}
diff --git a/src/main/java/org/monetdb/mcl/net/MapiSocket.java
b/src/main/java/org/monetdb/mcl/net/MapiSocket.java
--- a/src/main/java/org/monetdb/mcl/net/MapiSocket.java
+++ b/src/main/java/org/monetdb/mcl/net/MapiSocket.java
@@ -347,9 +347,9 @@ public final class MapiSocket {
throw e;
} catch (ValidationError e) {
close();
- throw new MCLException(e.getMessage());
- }
- }
+ throw new MCLException(e.getMessage());
+ }
+ }
private void connectSocket(Target.Validated validated) throws
MCLException, IOException {
// This method performs steps 2-6 of the procedure outlined in
the URL spec
@@ -384,9 +384,9 @@ public final class MapiSocket {
}
private Socket wrapTLS(Socket sock, Target.Validated validated) throws
IOException {
- if (validated.getTls())
- return SecureSocket.wrap(validated, sock);
- else {
+ if (validated.getTls())
+ return SecureSocket.wrap(validated, sock);
+ else {
// Send an even number of NUL bytes.
// We expect the server to speak the MAPI protocol and
in MAPI,
// NUL NUL is a no-op.
@@ -402,8 +402,8 @@ public final class MapiSocket {
// For now we standardize on 8.
sock.getOutputStream().write(NUL_BYTES);
}
- return sock;
- }
+ return sock;
+ }
private boolean handshake(Target.Validated validated, OptionsCallback
callback, ArrayList<String> warnings) throws IOException, MCLException {
String challenge = reader.getLine();
@@ -449,17 +449,17 @@ public final class MapiSocket {
} catch (URISyntaxException | ValidationError e) {
throw new MCLException("While processing redirect " +
redirect + ": " + e.getMessage(), e);
}
- if (redirect.startsWith("mapi:merovingian://proxy")) {
+ if (redirect.startsWith("mapi:merovingian://proxy")) {
// The reader is stuck at LineType.PROMPT but actually
the
// next challenge is already there.
- reader.resetLineType();
+ reader.resetLineType();
reader.advance();
- } else {
- close();
- }
+ } else {
+ close();
+ }
- return false; // we need another go
- }
+ return false; // we need another go
+ }
private String challengeResponse(
Target.Validated validated, final String challengeLine,
@@ -565,22 +565,22 @@ public final class MapiSocket {
*/
private MessageDigest pickBestAlgorithm(Set<String> algos,
StringBuilder appendMapiName) throws MCLException {
for (String[] choice: KNOWN_ALGORITHMS) {
- String mapiName = choice[0];
- String algoName = choice[1];
- MessageDigest digest;
- if (!algos.contains(mapiName))
- continue;
- try {
- digest = MessageDigest.getInstance(algoName);
- } catch (NoSuchAlgorithmException e) {
- continue;
- }
- // we found a match
- if (appendMapiName != null) {
- appendMapiName.append(mapiName);
- }
- return digest;
- }
+ String mapiName = choice[0];
+ String algoName = choice[1];
+ MessageDigest digest;
+ if (!algos.contains(mapiName))
+ continue;
+ try {
+ digest = MessageDigest.getInstance(algoName);
+ } catch (NoSuchAlgorithmException e) {
+ continue;
+ }
+ // we found a match
+ if (appendMapiName != null) {
+ appendMapiName.append(mapiName);
+ }
+ return digest;
+ }
String algoNames = String.join(",", algos);
throw new MCLException("No supported hash algorithm: " +
algoNames);
}
@@ -610,22 +610,22 @@ public final class MapiSocket {
StringBuilder buffer = new StringBuilder();
callback.setBuffer(buffer);
- for (String optlevel: optionsPart.split(",")) {
- int eqindex = optlevel.indexOf('=');
- if (eqindex < 0)
- throw new MCLException("Invalid options part in server
challenge: " + optionsPart);
- String lang = optlevel.substring(0, eqindex);
- int level;
- try {
- level = Integer.parseInt(optlevel.substring(eqindex + 1));
- } catch (NumberFormatException e) {
- throw new MCLException("Invalid option level in server
challenge: " + optlevel);
- }
- callback.addOptions(lang, level);
- }
+ for (String optlevel: optionsPart.split(",")) {
+ int eqindex = optlevel.indexOf('=');
+ if (eqindex < 0)
+ throw new MCLException("Invalid options part in
server challenge: " + optionsPart);
+ String lang = optlevel.substring(0, eqindex);
+ int level;
+ try {
+ level =
Integer.parseInt(optlevel.substring(eqindex + 1));
+ } catch (NumberFormatException e) {
+ throw new MCLException("Invalid option level in
server challenge: " + optlevel);
+ }
+ callback.addOptions(lang, level);
+ }
return buffer.toString();
- }
+ }
/**
* Returns an InputStream that reads from this open connection on
diff --git a/src/main/java/org/monetdb/util/CmdLineOpts.java
b/src/main/java/org/monetdb/util/CmdLineOpts.java
--- a/src/main/java/org/monetdb/util/CmdLineOpts.java
+++ b/src/main/java/org/monetdb/util/CmdLineOpts.java
@@ -96,9 +96,9 @@ public final class CmdLineOpts {
option.addArgument(prop.getProperty(key));
} else if (!ignoredInFile.contains(key)) {
// ignore unknown options (it used to
throw an OptionsException)
- System.out.println("Info: Ignoring unknown/unsupported
option (in " + file.getAbsolutePath() + "): " + key);
- }
- }
+ System.out.println("Info: Ignoring
unknown/unsupported option (in " + file.getAbsolutePath() + "): " + key);
+ }
+ }
} catch (java.io.IOException e) {
throw new OptionsException("File IO Exception: " + e);
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
