Only assign fields if all fields can be created

Author: mrotteveel

src/main/org/firebirdsql/jdbc/FBPreparedStatement.java

@@ -774,32 +774,37 @@ protected void prepareFixedStatement(String sql) throws SQLException {
         RowDescriptor rowDescriptor = fbStatement.getParameterDescriptor();
         assert rowDescriptor != null : "RowDescriptor should not be null after prepare";
 
-        int fieldCount = rowDescriptor.getCount();
         fieldValues = rowDescriptor.createDefaultFieldValues();
-        fields = new FBField[fieldCount];
+        fields = createFields(rowDescriptor.getCount());
 
-        for (int i = 0; i < fieldCount; i++) {
-            final int fieldPosition = i;
+        this.isExecuteProcedureStatement = fbStatement.getType() == StatementType.STORED_PROCEDURE;
+    }
 
-            FieldDataProvider dataProvider = new FieldDataProvider() {
-                public byte[] getFieldData() {
-                    return fieldValues.getFieldData(fieldPosition);
-                }
+    private FBField[] createFields(final int fieldCount) throws SQLException {
+        FBField[] fields = new FBField[fieldCount];
+        for (int fieldPosition = 0; fieldPosition < fieldCount; fieldPosition++) {
+            fields[fieldPosition] = createField(fieldPosition);
+        }
+        return fields;
+    }
 
-                public void setFieldData(byte[] data) {
-                    fieldValues.setFieldData(fieldPosition, data);
-                }
-            };
+    private FBField createField(final int fieldPosition) throws SQLException {
+        FieldDataProvider dataProvider = new FieldDataProvider() {
+            public byte[] getFieldData() {
+                return fieldValues.getFieldData(fieldPosition);
+            }
 
-            // FIXME check if we can safely pass cached here
-            FBField field = FBField.createField(getParameterDescriptor(i + 1), dataProvider, gdsHelper, false);
-            if (field instanceof BlobListenableField) {
-                ((BlobListenableField) field).setBlobListener(blobListener);
+            public void setFieldData(byte[] data) {
+                fieldValues.setFieldData(fieldPosition, data);
             }
-            fields[i] = field;
-        }
+        };
 
-        this.isExecuteProcedureStatement = fbStatement.getType() == StatementType.STORED_PROCEDURE;
+        // TODO check if we can safely pass cached here
+        FBField field = FBField.createField(getParameterDescriptor(fieldPosition + 1), dataProvider, gdsHelper, false);
+        if (field instanceof BlobListenableField) {
+            ((BlobListenableField) field).setBlobListener(blobListener);
+        }
+        return field;
     }
 
     @Override